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_2.3.24] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
animated-image
/
image-cache.cpp
diff --git
a/dali-toolkit/internal/visuals/animated-image/image-cache.cpp
b/dali-toolkit/internal/visuals/animated-image/image-cache.cpp
index
3b5131f
..
ece9014
100644
(file)
--- a/
dali-toolkit/internal/visuals/animated-image/image-cache.cpp
+++ b/
dali-toolkit/internal/visuals/animated-image/image-cache.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 202
2
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
4
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-14,7
+14,8
@@
* limitations under the License.
*/
* limitations under the License.
*/
-#include "image-cache.h"
+// CLASS HEADER
+#include <dali-toolkit/internal/visuals/animated-image/image-cache.h>
namespace Dali
{
namespace Dali
{
@@
-29,7
+30,8
@@
ImageCache::ImageCache(TextureManager& textureManager,
TextureManager::MaskingDataPointer& maskingData,
ImageCache::FrameReadyObserver& observer,
uint32_t batchSize,
TextureManager::MaskingDataPointer& maskingData,
ImageCache::FrameReadyObserver& observer,
uint32_t batchSize,
- uint32_t interval)
+ uint32_t interval,
+ bool preMultiplyOnLoad)
: mTextureManager(textureManager),
mObserver(observer),
mMaskingData(maskingData),
: mTextureManager(textureManager),
mObserver(observer),
mMaskingData(maskingData),
@@
-40,22
+42,12
@@
ImageCache::ImageCache(TextureManager& textureManager,
mInterval(interval),
mLoadState(TextureManager::LoadState::NOT_STARTED),
mRequestingLoad(false),
mInterval(interval),
mLoadState(TextureManager::LoadState::NOT_STARTED),
mRequestingLoad(false),
- m
TextureManagerAlive(true
)
+ m
PreMultiplyOnLoad(preMultiplyOnLoad
)
{
{
- mTextureManager.AddObserver(*this);
}
ImageCache::~ImageCache()
{
}
ImageCache::~ImageCache()
{
- if(mTextureManagerAlive)
- {
- mTextureManager.RemoveObserver(*this);
- }
-}
-
-void ImageCache::TextureManagerDestroyed()
-{
- mTextureManagerAlive = false;
}
void ImageCache::SetInterval(uint32_t interval)
}
void ImageCache::SetInterval(uint32_t interval)