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.2.24] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
image-loader
/
image-atlas-impl.cpp
diff --git
a/dali-toolkit/internal/image-loader/image-atlas-impl.cpp
b/dali-toolkit/internal/image-loader/image-atlas-impl.cpp
index
da8fe90
..
d784d3e
100644
(file)
--- a/
dali-toolkit/internal/image-loader/image-atlas-impl.cpp
+++ b/
dali-toolkit/internal/image-loader/image-atlas-impl.cpp
@@
-33,6
+33,7
@@
namespace Toolkit
namespace Internal
{
+typedef unsigned char PixelBuffer;
Texture ImageAtlas::PackToAtlas( const std::vector<PixelData>& pixelData, Dali::Vector<Vector4>& textureRects )
{