Apply premultiply on initial time in animated visual

Change-Id: I7ce10be72455c659f5b5d09c3ce303f39dd13102

diff --git a/dali-toolkit/internal/texture-manager/texture-manager-impl.cpp b/dali-toolkit/internal/texture-manager/texture-manager-impl.cpp
index 44d365f..ef2e759 100644 (file)
--- a/dali-toolkit/internal/texture-manager/texture-manager-impl.cpp
+++ b/dali-toolkit/internal/texture-manager/texture-manager-impl.cpp
@@ -1441,7 +1441,7 @@ void TextureManager::EmitLoadComplete(TextureUploadObserver* observer, TextureMa
     TextureSet textureSet = GetTextureSet(textureInfo);
     if(textureInfo.isAnimatedImageFormat)
     {
-      observer->LoadComplete(success, TextureUploadObserver::TextureInformation(TextureUploadObserver::ReturnType::ANIMATED_IMAGE_TEXTURE, textureInfo.textureId, textureSet, textureInfo.frameCount, textureInfo.frameInterval));
+      observer->LoadComplete(success, TextureUploadObserver::TextureInformation(TextureUploadObserver::ReturnType::ANIMATED_IMAGE_TEXTURE, textureInfo.textureId, textureSet, textureInfo.frameCount, textureInfo.frameInterval, textureInfo.preMultiplied));
     }
     else
     {

diff --git a/dali-toolkit/internal/texture-manager/texture-upload-observer.cpp b/dali-toolkit/internal/texture-manager/texture-upload-observer.cpp
index 5761837..08a6df1 100644 (file)
--- a/dali-toolkit/internal/texture-manager/texture-upload-observer.cpp
+++ b/dali-toolkit/internal/texture-manager/texture-upload-observer.cpp
@@ -55,11 +55,11 @@ TextureUploadObserver::TextureInformation::TextureInformation(const ReturnType r
 {
 }
 
-TextureUploadObserver::TextureInformation::TextureInformation(const ReturnType returnType, const int32_t textureId, TextureSet textureSet, const uint32_t frameCount, const uint32_t interval)
+TextureUploadObserver::TextureInformation::TextureInformation(const ReturnType returnType, const int32_t textureId, TextureSet textureSet, const uint32_t frameCount, const uint32_t interval, const bool preMultiplied)
 : returnType(returnType),
   textureId(textureId),
   textureSet(textureSet),
-  preMultiplied(false),
+  preMultiplied(preMultiplied),
   pixelBuffer(),
   url(),
   frameCount(frameCount),

diff --git a/dali-toolkit/internal/texture-manager/texture-upload-observer.h b/dali-toolkit/internal/texture-manager/texture-upload-observer.h
index 7af80ea..3685a55 100644 (file)
--- a/dali-toolkit/internal/texture-manager/texture-upload-observer.h
+++ b/dali-toolkit/internal/texture-manager/texture-upload-observer.h
@@ -54,7 +54,7 @@ public:
     TextureInformation(const ReturnType returnType, const int32_t textureId, TextureSet textureSet, const bool preMultiplied);
     TextureInformation(const ReturnType returnType, const int32_t textureId, TextureSet textureSet, const std::string& url, const bool preMultiplied);
     TextureInformation(const ReturnType returnType, Devel::PixelBuffer pixelBuffer, const std::string& url, const bool preMultiplied);
-    TextureInformation(const ReturnType returnType, const int32_t textureId, TextureSet textureSet, const uint32_t frameCount, const uint32_t interval);
+    TextureInformation(const ReturnType returnType, const int32_t textureId, TextureSet textureSet, const uint32_t frameCount, const uint32_t interval, const bool preMultiplied);
 
     TextureInformation();