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
Moved StyleManager to the public API
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
image-atlas
/
image-atlas.h
diff --git
a/dali-toolkit/devel-api/image-atlas/image-atlas.h
b/dali-toolkit/devel-api/image-atlas/image-atlas.h
index
cef3eb7
..
315584a
100644
(file)
--- a/
dali-toolkit/devel-api/image-atlas/image-atlas.h
+++ b/
dali-toolkit/devel-api/image-atlas/image-atlas.h
@@
-24,13
+24,13
@@
#include <dali/public-api/images/image.h>
#include <dali/public-api/images/image-operations.h>
#include <dali/public-api/images/pixel.h>
#include <dali/public-api/images/image.h>
#include <dali/public-api/images/image-operations.h>
#include <dali/public-api/images/pixel.h>
+#include <dali/devel-api/images/pixel-data.h>
namespace Dali
{
namespace Toolkit
{
namespace Dali
{
namespace Toolkit
{
-
namespace Internal DALI_INTERNAL
{
class ImageAtlas;
namespace Internal DALI_INTERNAL
{
class ImageAtlas;
@@
-128,6
+128,14
@@
public:
bool orientationCorrection = true );
/**
bool orientationCorrection = true );
/**
+ * @brief Upload a pixel buffer to atlas
+ *
+ * @param [out] textureRect The texture area of the resource image in the atlas.
+ * @param [in] pixelData The pixel data.
+ */
+ bool Upload( Vector4& textureRect, PixelDataPtr pixelData );
+
+ /**
* @brief Remove the image at the given rectangle.
*
* The rectangular area is marked unoccupied, so new image can be added to this area.
* @brief Remove the image at the given rectangle.
*
* The rectangular area is marked unoccupied, so new image can be added to this area.