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) Added Video view test to increase coverage" into devel/master
[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
4e3bb0b
..
524b257
100644
(file)
--- a/
dali-toolkit/internal/image-atlas/image-atlas-impl.h
+++ b/
dali-toolkit/internal/image-atlas/image-atlas-impl.h
@@
-76,9
+76,9
@@
public:
bool orientationCorrection);
/**
bool orientationCorrection);
/**
- * @copydoc Toolkit::ImageAtlas::Upload( Vector4&, PixelData
Ptr
)
+ * @copydoc Toolkit::ImageAtlas::Upload( Vector4&, PixelData )
*/
*/
- bool Upload( Vector4& textureRect, PixelData
Ptr
pixelData );
+ bool Upload( Vector4& textureRect, PixelData pixelData );
/**
* @copydoc Toolkit::ImageAtlas::Remove
/**
* @copydoc Toolkit::ImageAtlas::Remove