Merge "Moved TextureSet::SetImage() to separate devel-api module" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / renderers / svg / svg-renderer.cpp

diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp b/dali-toolkit/internal/controls/renderers/svg/svg-renderer.cpp
index d6619d3..33c2b30 100644 (file)
--- 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 <dali/public-api/common/stage.h>
 #include <dali/public-api/math/vector4.h>
 #include <dali/devel-api/images/atlas.h>
+#include <dali/devel-api/images/texture-set-image.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include "nanosvg/nanosvg.h"
-#include "svg-rasterize-thread.h"
+#include <dali-toolkit/third-party/nanosvg/nanosvg.h>
+#include <dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.h>
 #include <dali-toolkit/internal/controls/renderers/image/image-renderer.h>
 #include <dali-toolkit/internal/controls/renderers/renderer-factory-cache.h>
 #include <dali-toolkit/internal/controls/renderers/renderer-string-constants.h>
@@ -96,7 +97,7 @@ void SvgRenderer::DoSetOnStage( Actor& actor )
   Geometry geometry = mFactoryCache.GetGeometry( RendererFactoryCache::QUAD_GEOMETRY );
   if( !geometry )
   {
-    geometry =  mFactoryCache.CreateQuadGeometry();
+    geometry =  Geometry::QUAD();
     mFactoryCache.SaveGeometry( RendererFactoryCache::QUAD_GEOMETRY, geometry );
   }
   TextureSet textureSet = TextureSet::New();
@@ -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 );
       }
     }
   }