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
Make do not caching pixelBuffer in texture-manager.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
npatch
/
npatch-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
b/dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
index
bd374aa
..
5c03ac2
100644
(file)
--- a/
dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
+++ b/
dali-toolkit/internal/visuals/npatch/npatch-visual.cpp
@@
-873,11
+873,17
@@
void NPatchVisual::LoadComplete( bool loadSuccess, Devel::PixelBuffer pixelBuffe
}
else
{
}
else
{
+ Devel::PixelBuffer loadedPixelBuffer;
if( loadSuccess )
{
if( loadSuccess )
{
-
mLoader.SetNPatchData( mId, pixelBuffer )
;
+
loadedPixelBuffer = pixelBuffer
;
EnablePreMultipliedAlpha( preMultiplied );
}
EnablePreMultipliedAlpha( preMultiplied );
}
+ else
+ {
+ loadedPixelBuffer = LoadImageFromFile( mFactoryCache.GetTextureManager().GetBrokenImageUrl() );
+ }
+ mLoader.SetNPatchData( loadSuccess, mId, loadedPixelBuffer, url, preMultiplied );
if( mAuxiliaryPixelBuffer || !mAuxiliaryUrl.IsValid() )
{
if( mAuxiliaryPixelBuffer || !mAuxiliaryUrl.IsValid() )
{