From: Heeyong Song Date: Thu, 4 Oct 2018 02:56:47 +0000 (+0900) Subject: Fix SVACE issue X-Git-Tag: dali_1.3.45~2^2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=35bad7cc4cc49975d6af559b1cd45b014046a2d6;ds=sidebyside Fix SVACE issue Change-Id: I1d5394c68604eef38d808f01a7fd1167a1509711 --- 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 5e520d8..890312c 100755 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -394,19 +394,23 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr // the property map contains only the custom shader else if( ( map->Count() == 1u )&&( shaderValue ) ) { - 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() ) + Property::Map* shaderMap = shaderValue->GetMap(); + if( shaderMap ) { - impl.SetImage( impl.mPropertyMap ); + 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 ); + } } } }