projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add synchronous loading of svg-visual
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
svg
/
svg-rasterize-thread.cpp
diff --git
a/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp
b/dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp
index
174183e
..
f0dc4a4
100644
(file)
--- a/
dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp
+++ b/
dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp
@@
-49,6
+49,12
@@
RasterizingTask::RasterizingTask( SvgVisual* svgRenderer, NSVGimage* parsedSvg,
mWidth( width ),
mHeight( height )
{
mWidth( width ),
mHeight( height )
{
+ mRasterizer = nsvgCreateRasterizer();
+}
+
+RasterizingTask::~RasterizingTask()
+{
+ nsvgDeleteRasterizer( mRasterizer );
}
void RasterizingTask::Load()
}
void RasterizingTask::Load()
@@
-73,7
+79,7
@@
void RasterizingTask::Load()
}
}
}
}
-void RasterizingTask::Rasterize(
NSVGrasterizer* rasterizer
)
+void RasterizingTask::Rasterize( )
{
if( mParsedSvg != NULL && mWidth > 0u && mHeight > 0u )
{
{
if( mParsedSvg != NULL && mWidth > 0u && mHeight > 0u )
{
@@
-84,7
+90,7
@@
void RasterizingTask::Rasterize( NSVGrasterizer* rasterizer )
unsigned int bufferSize = bufferStride * mHeight;
unsigned char* buffer = new unsigned char [bufferSize];
unsigned int bufferSize = bufferStride * mHeight;
unsigned char* buffer = new unsigned char [bufferSize];
- nsvgRasterize(
r
asterizer, mParsedSvg, 0.f,0.f,scale,
+ nsvgRasterize(
mR
asterizer, mParsedSvg, 0.f,0.f,scale,
buffer, mWidth, mHeight,
bufferStride );
buffer, mWidth, mHeight,
bufferStride );
@@
-111,13
+117,10
@@
SvgRasterizeThread::SvgRasterizeThread( EventThreadCallback* trigger )
: mTrigger( trigger ),
mIsThreadWaiting( false )
{
: mTrigger( trigger ),
mIsThreadWaiting( false )
{
- mRasterizer = nsvgCreateRasterizer();
}
SvgRasterizeThread::~SvgRasterizeThread()
{
}
SvgRasterizeThread::~SvgRasterizeThread()
{
-
- nsvgDeleteRasterizer( mRasterizer );
delete mTrigger;
}
delete mTrigger;
}
@@
-264,7
+267,7
@@
void SvgRasterizeThread::Run()
while( RasterizingTaskPtr task = NextTaskToProcess() )
{
task->Load( );
while( RasterizingTaskPtr task = NextTaskToProcess() )
{
task->Load( );
- task->Rasterize(
mRasterizer
);
+ task->Rasterize( );
AddCompletedTask( task );
}
}
AddCompletedTask( task );
}
}