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
(Vector) Fix occasional tc failure
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
animated-vector-image
/
vector-animation-task.cpp
diff --git
a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
index
4d31135
..
b79f422
100644
(file)
--- a/
dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
+++ b/
dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
@@
-397,11
+397,7
@@
bool VectorAnimationTask::Rasterize(bool& keepAnimation)
if(mLoadRequest)
{
if(mLoadRequest)
{
- bool result = Load();
- if(!result)
- {
- return false;
- }
+ return Load();
}
}
}
}
@@
-652,27
+648,18
@@
void VectorAnimationTask::ApplyAnimationData()
void VectorAnimationTask::OnUploadCompleted()
{
void VectorAnimationTask::OnUploadCompleted()
{
- mResourceReadySignal.Emit(
true
);
+ mResourceReadySignal.Emit(
ResourceStatus::READY
);
}
void VectorAnimationTask::OnLoadCompleted()
{
if(!mLoadFailed)
{
}
void VectorAnimationTask::OnLoadCompleted()
{
if(!mLoadFailed)
{
- if(mWidth == 0 && mHeight == 0)
- {
- uint32_t width, height;
- mVectorRenderer.GetDefaultSize(width, height);
-
- SetSize(width, height);
-
- mVectorAnimationThread.AddTask(this);
- }
+ mResourceReadySignal.Emit(ResourceStatus::LOADED);
}
else
{
}
else
{
- // Load failed
- mResourceReadySignal.Emit(false);
+ mResourceReadySignal.Emit(ResourceStatus::FAILED);
}
}
} // namespace Internal
}
}
} // namespace Internal