projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_1.4.57] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
animated-image
/
fixed-image-cache.cpp
diff --git
a/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp
b/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp
index
3764500
..
e64a51b
100644
(file)
--- a/
dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp
+++ b/
dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp
@@
-45,9
+45,12
@@
FixedImageCache::FixedImageCache(
FixedImageCache::~FixedImageCache()
{
FixedImageCache::~FixedImageCache()
{
-
for( std::size_t i = 0; i < mImageUrls.size() ; ++i
)
+
if( mTextureManagerAlive
)
{
{
- mTextureManager.Remove( mImageUrls[i].mTextureId );
+ for( std::size_t i = 0; i < mImageUrls.size() ; ++i )
+ {
+ mTextureManager.Remove( mImageUrls[i].mTextureId, this );
+ }
}
}
}
}
@@
-113,14
+116,17
@@
void FixedImageCache::LoadBatch()
AtlasUploadObserver* atlasObserver = nullptr;
ImageAtlasManagerPtr imageAtlasManager = nullptr;
Vector4 textureRect;
AtlasUploadObserver* atlasObserver = nullptr;
ImageAtlasManagerPtr imageAtlasManager = nullptr;
Vector4 textureRect;
+ Dali::ImageDimensions textureRectSize;
+ auto preMultiply = TextureManager::MultiplyOnLoad::LOAD_WITHOUT_MULTIPLY;
mTextureManager.LoadTexture(
url, ImageDimensions(), FittingMode::SCALE_TO_FILL,
SamplingMode::BOX_THEN_LINEAR, maskInfo,
mTextureManager.LoadTexture(
url, ImageDimensions(), FittingMode::SCALE_TO_FILL,
SamplingMode::BOX_THEN_LINEAR, maskInfo,
- synchronousLoading, mImageUrls[ mUrlIndex ].mTextureId, textureRect,
+ synchronousLoading, mImageUrls[ mUrlIndex ].mTextureId, textureRect,
textureRectSize,
atlasingStatus, loadingStatus, Dali::WrapMode::Type::DEFAULT,
Dali::WrapMode::Type::DEFAULT, this,
atlasingStatus, loadingStatus, Dali::WrapMode::Type::DEFAULT,
Dali::WrapMode::Type::DEFAULT, this,
- atlasObserver, imageAtlasManager, ENABLE_ORIENTATION_CORRECTION, TextureManager::ReloadPolicy::CACHED );
+ atlasObserver, imageAtlasManager, ENABLE_ORIENTATION_CORRECTION, TextureManager::ReloadPolicy::CACHED,
+ preMultiply );
if( loadingStatus == false ) // not loading, means it's already ready.
{
if( loadingStatus == false ) // not loading, means it's already ready.
{
@@
-164,7
+170,8
@@
void FixedImageCache::UploadComplete(
int32_t textureId,
TextureSet textureSet,
bool useAtlasing,
int32_t textureId,
TextureSet textureSet,
bool useAtlasing,
- const Vector4& atlasRect )
+ const Vector4& atlasRect,
+ bool preMultiplied)
{
bool frontFrameReady = IsFrontReady();
{
bool frontFrameReady = IsFrontReady();