projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[4.0] Restore Uploaded signal for BufferImage and ResourceImage
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
event
/
images
/
resource-image-impl.cpp
diff --git
a/dali/internal/event/images/resource-image-impl.cpp
b/dali/internal/event/images/resource-image-impl.cpp
index
26114ac
..
ea72dcb
100644
(file)
--- a/
dali/internal/event/images/resource-image-impl.cpp
+++ b/
dali/internal/event/images/resource-image-impl.cpp
@@
-147,7
+147,7
@@
void ResourceImage::Reload()
mAttributes.GetOrientationCorrection() );
// Note, bitmap is only destroyed when the image is destroyed.
mAttributes.GetOrientationCorrection() );
// Note, bitmap is only destroyed when the image is destroyed.
- Integration::ResourcePointer resource = platformAbstraction.Load
Resourc
eSynchronously( resourceType, mUrl );
+ Integration::ResourcePointer resource = platformAbstraction.Load
Imag
eSynchronously( resourceType, mUrl );
if( resource )
{
Integration::Bitmap* bitmap = static_cast<Integration::Bitmap*>( resource.Get() );
if( resource )
{
Integration::Bitmap* bitmap = static_cast<Integration::Bitmap*>( resource.Get() );
@@
-186,6
+186,7
@@
void ResourceImage::Reload()
mLoadingState = Dali::ResourceLoadingFailed;
}
mLoadingState = Dali::ResourceLoadingFailed;
}
+ UploadedSignal().Emit( Dali::Image( this ) );
mLoadingFinished.Emit( Dali::ResourceImage( this ) );
}
mLoadingFinished.Emit( Dali::ResourceImage( this ) );
}