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
Remove more ImageActors from Toolkit
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
image-atlas
/
image-atlas-impl.h
diff --git
a/dali-toolkit/internal/image-atlas/image-atlas-impl.h
b/dali-toolkit/internal/image-atlas/image-atlas-impl.h
index
c3e621c
..
4e3bb0b
100644
(file)
--- a/
dali-toolkit/internal/image-atlas/image-atlas-impl.h
+++ b/
dali-toolkit/internal/image-atlas/image-atlas-impl.h
@@
-67,7
+67,7
@@
public:
void SetBrokenImage( const std::string& brokenImageUrl );
/**
void SetBrokenImage( const std::string& brokenImageUrl );
/**
- * @copydoc Toolkit::ImageAtlas::Upload
+ * @copydoc Toolkit::ImageAtlas::Upload
( Vector4&, const std::string&, ImageDimensions,FittingMode::Type, bool )
*/
bool Upload( Vector4& textureRect,
const std::string& url,
*/
bool Upload( Vector4& textureRect,
const std::string& url,
@@
-76,6
+76,11
@@
public:
bool orientationCorrection);
/**
bool orientationCorrection);
/**
+ * @copydoc Toolkit::ImageAtlas::Upload( Vector4&, PixelDataPtr )
+ */
+ bool Upload( Vector4& textureRect, PixelDataPtr pixelData );
+
+ /**
* @copydoc Toolkit::ImageAtlas::Remove
*/
void Remove( const Vector4& textureRect );
* @copydoc Toolkit::ImageAtlas::Remove
*/
void Remove( const Vector4& textureRect );