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
Merge "Add CURRENT_FRAME_NUMBER and TOTAL_FRAME_NUMBER properties to the AnimatedImag...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
image-loader
/
image-load-thread.cpp
diff --git
a/dali-toolkit/internal/image-loader/image-load-thread.cpp
b/dali-toolkit/internal/image-loader/image-load-thread.cpp
index
dae742d
..
9b68176
100644
(file)
--- a/
dali-toolkit/internal/image-loader/image-load-thread.cpp
+++ b/
dali-toolkit/internal/image-loader/image-load-thread.cpp
@@
-90,7
+90,7
@@
LoadingTask::LoadingTask( uint32_t id, Devel::PixelBuffer pixelBuffer, Devel::Pi
}
void LoadingTask::Load()
}
void LoadingTask::Load()
-{
;
+{
if( animatedImageLoading )
{
pixelBuffer = animatedImageLoading.LoadFrame( frameIndex );
if( animatedImageLoading )
{
pixelBuffer = animatedImageLoading.LoadFrame( frameIndex );
@@
-140,6
+140,18
@@
ImageLoadThread::~ImageLoadThread()
Join();
delete mTrigger;
Join();
delete mTrigger;
+
+ for( auto&& iter : mLoadQueue )
+ {
+ delete iter;
+ }
+ mLoadQueue.Clear();
+
+ for( auto&& iter : mCompleteQueue )
+ {
+ delete iter;
+ }
+ mCompleteQueue.Clear();
}
void ImageLoadThread::Run()
}
void ImageLoadThread::Run()