Merge "[3.0] Tizen Directory Migration" into tizen

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

diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp b/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp
index 9e01462..9e2e707 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp
+++ b/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp
@@ -19,13 +19,8 @@
 #include "svg-rasterize-thread.h"
 
 // INTERNAL INCLUDES
-#include "nanosvg/nanosvgrast.h"
-#include "svg-renderer.h"
-
-namespace
-{
-const std::string TEXTURE_UNIFORM_NAME = "sTexture";
-}
+#include <dali-toolkit/third-party/nanosvg/nanosvgrast.h>
+#include <dali-toolkit/internal/controls/renderers/svg/svg-renderer.h>
 
 namespace Dali
 {
@@ -67,7 +62,7 @@ SvgRenderer* RasterizingTask::GetSvgRenderer() const
   return mSvgRenderer.Get();
 }
 
-PixelDataPtr RasterizingTask::GetPixelData() const
+PixelData RasterizingTask::GetPixelData() const
 {
   return mPixelData;
 }
@@ -110,8 +105,8 @@ void SvgRasterizeThread::AddTask( RasterizingTaskPtr task )
     wasEmpty = mRasterizeTasks.empty();
     if( !wasEmpty && task != NULL)
     {
-      // Remove the tasks with the same material.
-      // Older task which waiting to rasterize and apply the svg to the same material is expired.
+      // Remove the tasks with the same renderer.
+      // Older task which waiting to rasterize and apply the svg to the same renderer is expired.
       for( std::vector< RasterizingTaskPtr >::iterator it = mRasterizeTasks.begin(), endIt = mRasterizeTasks.end(); it != endIt; ++it )
       {
         if( (*it) && (*it)->GetSvgRenderer() == task->GetSvgRenderer() )