Merge "Merge branch 'devel/master' into devel/graphics" into devel/master

diff --combined dali/internal/imaging/tizen/native-image-source-impl-tizen.cpp
index 41618eb,45bc83c..75417e4
--- 1/dali/internal/imaging/tizen/native-image-source-impl-tizen.cpp
--- 2/dali/internal/imaging/tizen/native-image-source-impl-tizen.cpp
+++ b/dali/internal/imaging/tizen/native-image-source-impl-tizen.cpp
@@@ -38,7 -38,7 +38,7 @@@ namespace Adapto
  {
  namespace
  {
- const char* SAMPLER_TYPE    = "samplerExternalOES";
+ const char* SAMPLER_TYPE = "samplerExternalOES";
  
  // clang-format off
  tbm_format FORMATS_BLENDING_REQUIRED[] = {
@@@ -508,7 -508,7 +508,7 @@@ uint8_t* NativeImageSourceTizen::Acquir
    {
      tbm_surface_info_s info;
  
 -    if(tbm_surface_map(mTbmSurface, TBM_SURF_OPTION_READ, &info) != TBM_SURFACE_ERROR_NONE)
 +    if(tbm_surface_map(mTbmSurface, TBM_SURF_OPTION_READ | TBM_SURF_OPTION_WRITE, &info) != TBM_SURFACE_ERROR_NONE)
      {
        DALI_LOG_ERROR("Fail to map tbm_surface\n");