From: Heeyong Song Date: Tue, 27 Mar 2018 01:25:02 +0000 (+0000) Subject: Merge "supports remote URL gif image" into devel/master X-Git-Tag: dali_1.3.18~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=e3a661ed9b8268e1ebac5ab26088673de706c509;hp=-c Merge "supports remote URL gif image" into devel/master --- e3a661ed9b8268e1ebac5ab26088673de706c509 diff --combined dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp index d216ff6,b9f9bb6..fcb3811 --- a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp +++ b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.cpp @@@ -154,7 -154,7 +154,7 @@@ AnimatedImageVisualPtr AnimatedImageVis void AnimatedImageVisual::InitializeGif( const VisualUrl& imageUrl ) { mImageUrl = imageUrl; - mGifLoading = GifLoading::New( imageUrl.GetUrl() ); + mGifLoading = GifLoading::New( imageUrl.GetUrl(), imageUrl.IsLocalResource() ); mFrameCount = mGifLoading->GetImageCount(); mGifLoading->LoadFrameDelays( mFrameDelayContainer ); } @@@ -332,7 -332,7 +332,7 @@@ void AnimatedImageVisual::DoSetProperty } case Toolkit::ImageVisual::Property::WRAP_MODE_U: { - int wrapMode; + int wrapMode = 0; if(Scripting::GetEnumerationProperty( value, WRAP_MODE_TABLE, WRAP_MODE_TABLE_COUNT, wrapMode )) { mWrapModeU = Dali::WrapMode::Type(wrapMode); @@@ -345,7 -345,7 +345,7 @@@ } case Toolkit::ImageVisual::Property::WRAP_MODE_V: { - int wrapMode; + int wrapMode = 0; if(Scripting::GetEnumerationProperty( value, WRAP_MODE_TABLE, WRAP_MODE_TABLE_COUNT, wrapMode )) { mWrapModeV = Dali::WrapMode::Type(wrapMode);