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
[dali_1.1.41] Merge branch 'devel/master'
[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
5202d42
..
f1dc374
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,8
+19,8
@@
#include "svg-rasterize-thread.h"
// INTERNAL INCLUDES
#include "svg-rasterize-thread.h"
// INTERNAL INCLUDES
-#include
"nanosvg/nanosvgrast.h"
-#include
"svg-renderer.h"
+#include
<dali-toolkit/third-party/nanosvg/nanosvgrast.h>
+#include
<dali-toolkit/internal/controls/renderers/svg/svg-renderer.h>
namespace Dali
{
namespace Dali
{
@@
-47,13
+47,14
@@
void RasterizingTask::Rasterize( NSVGrasterizer* rasterizer )
float scaleY = static_cast<float>( mHeight ) / mParsedSvg->height;
float scale = scaleX < scaleY ? scaleX : scaleY;
unsigned int bufferStride = mWidth*Pixel::GetBytesPerPixel( Pixel::RGBA8888 );
float scaleY = static_cast<float>( mHeight ) / mParsedSvg->height;
float scale = scaleX < scaleY ? scaleX : scaleY;
unsigned int bufferStride = mWidth*Pixel::GetBytesPerPixel( Pixel::RGBA8888 );
+ unsigned int bufferSize = bufferStride * mHeight;
- unsigned char* buffer = new unsigned char [bufferS
tride*mHeight
];
+ unsigned char* buffer = new unsigned char [bufferS
ize
];
nsvgRasterize(rasterizer, mParsedSvg, 0.f,0.f,scale,
buffer, mWidth, mHeight,
bufferStride );
nsvgRasterize(rasterizer, mParsedSvg, 0.f,0.f,scale,
buffer, mWidth, mHeight,
bufferStride );
- mPixelData = Dali::PixelData::New( buffer, mWidth, mHeight, Pixel::RGBA8888, Dali::PixelData::DELETE_ARRAY );
+ mPixelData = Dali::PixelData::New( buffer,
bufferSize,
mWidth, mHeight, Pixel::RGBA8888, Dali::PixelData::DELETE_ARRAY );
}
}
}
}
@@
-62,7
+63,7
@@
SvgRenderer* RasterizingTask::GetSvgRenderer() const
return mSvgRenderer.Get();
}
return mSvgRenderer.Get();
}
-PixelData
Ptr
RasterizingTask::GetPixelData() const
+PixelData RasterizingTask::GetPixelData() const
{
return mPixelData;
}
{
return mPixelData;
}