X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Fsvg%2Fsvg-renderer.cpp;h=8e50eccf00c4646c3a4dfb77f9830d7fe594f82b;hp=d6619d3844baa367852b2f756e01a5a7403f187e;hb=54fbf47db890d0479d19d780de5ea5d860924632;hpb=e4ace0da6e0d702b90e5a70d477aa7a0e0f6f44f diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp b/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp index d6619d3..8e50ecc 100644 --- a/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp @@ -23,11 +23,12 @@ #include #include #include +#include #include // INTERNAL INCLUDES -#include "nanosvg/nanosvg.h" -#include "svg-rasterize-thread.h" +#include +#include #include #include #include @@ -189,7 +190,7 @@ void SvgRenderer::AddRasterizationTask( const Vector2& size ) } } -void SvgRenderer::ApplyRasterizedImage( PixelDataPtr rasterizedPixelData ) +void SvgRenderer::ApplyRasterizedImage( PixelData rasterizedPixelData ) { if( GetIsOnStage() ) { @@ -212,7 +213,7 @@ void SvgRenderer::ApplyRasterizedImage( PixelDataPtr rasterizedPixelData ) } else // no atlasing { - Atlas texture = Atlas::New( rasterizedPixelData->GetWidth(), rasterizedPixelData->GetHeight() ); + Atlas texture = Atlas::New( rasterizedPixelData.GetWidth(), rasterizedPixelData.GetHeight() ); texture.Upload( rasterizedPixelData, 0, 0 ); if( mAtlasRect == FULL_TEXTURE_RECT ) @@ -230,7 +231,7 @@ void SvgRenderer::ApplyRasterizedImage( PixelDataPtr rasterizedPixelData ) if( textureSet ) { - textureSet.SetImage( 0u, texture ); + TextureSetImage( textureSet, 0u, texture ); } } }