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
Merge "(Automated Tests) All tests passing on Ubuntu 16.04" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
image-loader
/
image-atlas.cpp
diff --git
a/dali-toolkit/devel-api/image-loader/image-atlas.cpp
b/dali-toolkit/devel-api/image-loader/image-atlas.cpp
index
fd6825e
..
84903b3
100644
(file)
--- a/
dali-toolkit/devel-api/image-loader/image-atlas.cpp
+++ b/
dali-toolkit/devel-api/image-loader/image-atlas.cpp
@@
-35,6
+35,11
@@
ImageAtlas::~ImageAtlas()
{
}
{
}
+Texture ImageAtlas::PackToAtlas( const std::vector<PixelData>& pixelData, Dali::Vector<Vector4>& textureRects )
+{
+ return Internal::ImageAtlas::PackToAtlas( pixelData, textureRects );
+}
+
ImageAtlas::ImageAtlas(Internal::ImageAtlas* internal)
: BaseHandle( internal )
{
ImageAtlas::ImageAtlas(Internal::ImageAtlas* internal)
: BaseHandle( internal )
{