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
Stop using deprecated API from Popup and fix typo in Control
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
image-loader
/
image-atlas-impl.h
diff --git
a/dali-toolkit/internal/image-loader/image-atlas-impl.h
b/dali-toolkit/internal/image-loader/image-atlas-impl.h
index
a773ea7
..
2980627
100644
(file)
--- a/
dali-toolkit/internal/image-loader/image-atlas-impl.h
+++ b/
dali-toolkit/internal/image-loader/image-atlas-impl.h
@@
-27,8
+27,8
@@
// INTERNAL INCLUDES
#include <dali-toolkit/devel-api/image-loader/image-atlas.h>
// INTERNAL INCLUDES
#include <dali-toolkit/devel-api/image-loader/image-atlas.h>
-#include <dali-toolkit/devel-api/image-loader/async-image-loader.h>
#include <dali-toolkit/internal/image-loader/atlas-packer.h>
#include <dali-toolkit/internal/image-loader/atlas-packer.h>
+#include <dali-toolkit/public-api/image-loader/async-image-loader.h>
namespace Dali
{
namespace Dali
{
@@
-47,6
+47,11
@@
public:
typedef Toolkit::ImageAtlas::SizeType SizeType;
/**
typedef Toolkit::ImageAtlas::SizeType SizeType;
/**
+ * @copydoc ImageAtlas::PackToAtlas( const std::vector<PixelData>&, Dali::Vector<Vector4>& )
+ */
+ static Texture PackToAtlas( const std::vector<PixelData>& pixelData, Dali::Vector<Vector4>& textureRects );
+
+ /**
* Constructor
* @param [in] width The atlas width in pixels.
* @param [in] height The atlas height in pixels.
* Constructor
* @param [in] width The atlas width in pixels.
* @param [in] height The atlas height in pixels.