X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fanimated-vector-image%2Fvector-animation-task.cpp;h=b79f42258ff38633979d8023eb5978fb530f9fbb;hp=4d31135c09005f4561bd353fa8fada9a32916710;hb=e8954068388a568c9d89de31ae033fe94d0ce20d;hpb=959f0134ef092cda808d6b810708bc21c95cd7d6 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 --- 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) { - bool result = Load(); - if(!result) - { - return false; - } + return Load(); } } @@ -652,27 +648,18 @@ void VectorAnimationTask::ApplyAnimationData() void VectorAnimationTask::OnUploadCompleted() { - mResourceReadySignal.Emit(true); + mResourceReadySignal.Emit(ResourceStatus::READY); } 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 { - // Load failed - mResourceReadySignal.Emit(false); + mResourceReadySignal.Emit(ResourceStatus::FAILED); } } } // namespace Internal