From 753e46f079f6cabdfd7da13acbde5ee62cf57111 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Mon, 5 Nov 2018 17:20:11 +0900 Subject: [PATCH] Revert "[Tizen] Fix SVACE issue" This reverts commit 904622ff2041870d9167235ccdafc4a991e2abe6. --- .../controls/image-view/image-view-impl.cpp | 28 ++++++++++------------ 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp index 859ef08..f332cf6 100755 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -410,23 +410,19 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr // the property map contains only the custom shader else if( ( map->Count() == 1u )&&( shaderValue ) ) { - Property::Map* shaderMap = shaderValue->GetMap(); - if( shaderMap ) + impl.mShaderMap = *( shaderValue->GetMap() ); + + if( !impl.mUrl.empty() ) + { + impl.SetImage( impl.mUrl, impl.mImageSize ); + } + else if( impl.mImage ) + { + impl.SetImage( impl.mImage ); + } + else if( !impl.mPropertyMap.Empty() ) { - impl.mShaderMap = *shaderMap; - - if( !impl.mUrl.empty() ) - { - impl.SetImage( impl.mUrl, impl.mImageSize ); - } - else if( impl.mImage ) - { - impl.SetImage( impl.mImage ); - } - else if( !impl.mPropertyMap.Empty() ) - { - impl.SetImage( impl.mPropertyMap ); - } + impl.SetImage( impl.mPropertyMap ); } } } -- 2.7.4