X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fanimated-image%2Ffixed-image-cache.cpp;h=b1713d21453be5bd58ad532228625eb8e11a5d8d;hb=refs%2Fchanges%2F96%2F165896%2F1;hp=f1b3411e34cd488a225005d9d424e8efd800642c;hpb=49f7b38fb9b98b449ebafd09e5eee77f6ea6d59b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp b/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp old mode 100644 new mode 100755 index f1b3411..b1713d2 --- a/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp +++ b/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp @@ -113,6 +113,7 @@ void FixedImageCache::LoadBatch() AtlasUploadObserver* atlasObserver = nullptr; ImageAtlasManagerPtr imageAtlasManager = nullptr; Vector4 textureRect; + auto preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY; mTextureManager.LoadTexture( url, ImageDimensions(), FittingMode::SCALE_TO_FILL, @@ -121,7 +122,7 @@ void FixedImageCache::LoadBatch() atlasingStatus, loadingStatus, Dali::WrapMode::Type::DEFAULT, Dali::WrapMode::Type::DEFAULT, this, atlasObserver, imageAtlasManager, ENABLE_ORIENTATION_CORRECTION, TextureManager::ReloadPolicy::CACHED, - TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY ); + preMultiply ); if( loadingStatus == false ) // not loading, means it's already ready. { @@ -165,7 +166,8 @@ void FixedImageCache::UploadComplete( int32_t textureId, TextureSet textureSet, bool useAtlasing, - const Vector4& atlasRect ) + const Vector4& atlasRect, + bool preMultiplied) { bool frontFrameReady = IsFrontReady();