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
[dali_1.4.57] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
svg
/
svg-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/svg/svg-visual.cpp
b/dali-toolkit/internal/visuals/svg/svg-visual.cpp
index
051affe
..
45566bc
100644
(file)
--- a/
dali-toolkit/internal/visuals/svg/svg-visual.cpp
+++ b/
dali-toolkit/internal/visuals/svg/svg-visual.cpp
@@
-224,6
+224,11
@@
void SvgVisual::AddRasterizationTask( const Vector2& size )
void SvgVisual::ApplyRasterizedImage( NSVGimage* parsedSvg, PixelData rasterizedPixelData )
{
void SvgVisual::ApplyRasterizedImage( NSVGimage* parsedSvg, PixelData rasterizedPixelData )
{
+ if( mParsedImage == NULL)
+ {
+ mParsedImage = parsedSvg;
+ }
+
if( mParsedImage && IsOnStage() )
{
TextureSet currentTextureSet = mImpl->mRenderer.GetTextures();
if( mParsedImage && IsOnStage() )
{
TextureSet currentTextureSet = mImpl->mRenderer.GetTextures();
@@
-288,6
+293,10
@@
void SvgVisual::ApplyRasterizedImage( NSVGimage* parsedSvg, PixelData rasterized
// Svg loaded and ready to display
ResourceReady( Toolkit::Visual::ResourceStatus::READY );
}
// Svg loaded and ready to display
ResourceReady( Toolkit::Visual::ResourceStatus::READY );
}
+ else if( !mParsedImage )
+ {
+ ResourceReady( Toolkit::Visual::ResourceStatus::FAILED );
+ }
}
void SvgVisual::OnSetTransform()
}
void SvgVisual::OnSetTransform()
@@
-309,6
+318,12
@@
void SvgVisual::OnSetTransform()
}
}
}
}
+bool SvgVisual::IsResourceReady() const
+{
+ return ( mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY ||
+ mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::FAILED );
+}
+
} // namespace Internal
} // namespace Toolkit
} // namespace Internal
} // namespace Toolkit