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 "Add Privilege tags to dali.doxy.in" into devel/master
[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
..
2bc97ae
100644
(file)
--- a/
dali-toolkit/devel-api/image-atlas/image-atlas.h
+++ b/
dali-toolkit/devel-api/image-atlas/image-atlas.h
@@
-1,7
+1,7
@@
-#ifndef
__DALI_TOOLKIT_IMAGE_ATLAS_H__
-#define
__DALI_TOOLKIT_IMAGE_ATLAS_H__
+#ifndef
DALI_TOOLKIT_IMAGE_ATLAS_H
+#define
DALI_TOOLKIT_IMAGE_ATLAS_H
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-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/public-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;
@@
-83,7
+83,7
@@
public:
/**
* @brief This assignment operator is required for (smart) pointer semantics.
*
/**
* @brief This assignment operator is required for (smart) pointer semantics.
*
- * @param [in]
rhs
A reference to the copied handle
+ * @param [in]
handle
A reference to the copied handle
* @return A reference to this
*/
ImageAtlas& operator=( const ImageAtlas& handle );
* @return A reference to this
*/
ImageAtlas& operator=( const ImageAtlas& handle );
@@
-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, PixelData 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.
@@
-145,4
+153,4
@@
public: // Not intended for developer use
} // namespace Dali
} // namespace Dali
-#endif /
* __DALI_TOOLKIT_IMAGE_ATLAS_H__ */
+#endif /
/ DALI_TOOLKIT_IMAGE_ATLAS_H