Updates following the PixelData change

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

diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.h b/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.h
index 8309674..556a7e6 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.h
+++ b/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.h
@@ -21,7 +21,7 @@
 #include <dali/devel-api/threading/conditional-wait.h>
 #include <dali/devel-api/threading/mutex.h>
 #include <dali/devel-api/threading/thread.h>
 #include <dali/devel-api/threading/conditional-wait.h>
 #include <dali/devel-api/threading/mutex.h>
 #include <dali/devel-api/threading/thread.h>

-#include <dali/devel-api/rendering/material.h>
+#include <dali/devel-api/rendering/texture-set.h>

 #include <dali/devel-api/images/pixel-data.h>
 #include <dali/public-api/images/buffer-image.h>
 #include <dali/public-api/common/intrusive-ptr.h>
 #include <dali/devel-api/images/pixel-data.h>
 #include <dali/public-api/images/buffer-image.h>
 #include <dali/public-api/common/intrusive-ptr.h>


@@ -85,7 +85,7 @@ public:
    * Get the rasterization result.
    * @return The pixel data with the rasterized pixels.
    */
    * Get the rasterization result.
    * @return The pixel data with the rasterized pixels.
    */

-  PixelDataPtr GetPixelData() const;
+  PixelData GetPixelData() const;

 
 private:
 
 
 private:
 


@@ -97,7 +97,7 @@ private:
 
 private:
   SvgRendererPtr  mSvgRenderer;
 
 private:
   SvgRendererPtr  mSvgRenderer;

-  PixelDataPtr    mPixelData;
+  PixelData       mPixelData;

   NSVGimage*      mParsedSvg;
   unsigned int    mWidth;
   unsigned int    mHeight;
   NSVGimage*      mParsedSvg;
   unsigned int    mWidth;
   unsigned int    mHeight;


@@ -138,9 +138,9 @@ public:
   RasterizingTaskPtr NextCompletedTask();
 
   /**
   RasterizingTaskPtr NextCompletedTask();
 
   /**

-   * Remove the task with the given material from the waiting queue, called by main thread.
+   * Remove the task with the given renderer from the waiting queue, called by main thread.

    *
    *

-   * Typically called when the actor is put off stage, so the material is not needed anymore.
+   * Typically called when the actor is put off stage, so the renderer is not needed anymore.

    *
    * @param[in] renderer The renderer pointer.
    */
    *
    * @param[in] renderer The renderer pointer.
    */


@@ -181,7 +181,7 @@ protected:
 
   /**
    * The entry function of the worker thread.
 
   /**
    * The entry function of the worker thread.

-   * It fetches task from the Queue, rasterizes the image and apply to the material.
+   * It fetches task from the Queue, rasterizes the image and apply to the renderer.

    */
   virtual void Run();
 
    */
   virtual void Run();