-#ifndef __DALI_TOOLKIT_SVG_RASTERIZE_THREAD_H__
-#define __DALI_TOOLKIT_SVG_RASTERIZE_THREAD_H__
+#ifndef DALI_TOOLKIT_SVG_RASTERIZE_THREAD_H
+#define DALI_TOOLKIT_SVG_RASTERIZE_THREAD_H
/*
* Copyright (c) 2016 Samsung Electronics Co., Ltd.
*/
// EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/event-thread-callback.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/texture-set.h>
-#include <dali/devel-api/images/pixel-data.h>
#include <dali/public-api/images/buffer-image.h>
+#include <dali/public-api/images/pixel-data.h>
#include <dali/public-api/common/intrusive-ptr.h>
#include <dali/public-api/common/vector-wrapper.h>
#include <dali/public-api/object/ref-object.h>
-#include <dali/devel-api/adaptor-framework/event-thread-callback.h>
+#include <dali/public-api/rendering/texture-set.h>
struct NSVGimage;
struct NSVGrasterizer;
namespace Internal
{
-class SvgRenderer;
-typedef IntrusivePtr< SvgRenderer > SvgRendererPtr;
+class SvgVisual;
+typedef IntrusivePtr< SvgVisual > SvgVisualPtr;
class RasterizingTask;
typedef IntrusivePtr< RasterizingTask > RasterizingTaskPtr;
* The svg rasterizing tasks to be processed in the worker thread.
*
* Life cycle of a rasterizing task is as follows:
- * 1. Created by SvgRenderer in the main thread
+ * 1. Created by SvgVisual in the main thread
* 2. Queued in the worked thread waiting to be processed.
* 3. If this task gets its turn to do the rasterization, it triggers main thread to apply the rasterized image to material then been deleted in main thread call back
* Or if this task is been removed ( new image/size set to the renderer or actor off stage) before its turn to be processed, it then been deleted in the worker thread.
* @param[in] width The rasterization width.
* @param[in] height The rasterization height.
*/
- RasterizingTask( SvgRenderer* svgRenderer, NSVGimage* parsedSvg, unsigned int width, unsigned int height );
+ RasterizingTask( SvgVisual* svgRenderer, NSVGimage* parsedSvg, unsigned int width, unsigned int height );
/**
* Do the rasterization with the given rasterizer.
/**
* Get the svg renderer
*/
- SvgRenderer* GetSvgRenderer() const;
+ SvgVisual* GetSvgVisual() const;
/**
* Get the rasterization result.
* @return The pixel data with the rasterized pixels.
*/
- PixelDataPtr GetPixelData() const;
+ PixelData GetPixelData() const;
private:
RasterizingTask& operator=( const RasterizingTask& task );
private:
- SvgRendererPtr mSvgRenderer;
- PixelDataPtr mPixelData;
+ SvgVisualPtr mSvgVisual;
+ PixelData mPixelData;
NSVGimage* mParsedSvg;
unsigned int mWidth;
unsigned int mHeight;
*
* @param[in] renderer The renderer pointer.
*/
- void RemoveTask( SvgRenderer* renderer );
+ void RemoveTask( SvgVisual* renderer );
/**
* Delete the parsed SVG image, called by main thread.
} // namespace Dali
-#endif /* __DALI_TOOLKIT_SVG_RASTERIZE_THREAD_H__ */
+#endif // DALI_TOOLKIT_SVG_RASTERIZE_THREAD_H