projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(GCC 6.2) Remove unused functions from automated tests
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
event
/
images
/
atlas-impl.h
diff --git
a/dali/internal/event/images/atlas-impl.h
b/dali/internal/event/images/atlas-impl.h
index
4bb2ce2
..
d7e704b
100644
(file)
--- a/
dali/internal/event/images/atlas-impl.h
+++ b/
dali/internal/event/images/atlas-impl.h
@@
-20,7
+20,7
@@
// INTERNAL INCLUDES
#include <dali/public-api/common/dali-vector.h>
// INTERNAL INCLUDES
#include <dali/public-api/common/dali-vector.h>
-#include <dali/
public
-api/images/atlas.h>
+#include <dali/
devel
-api/images/atlas.h>
#include <dali/internal/event/images/context-recovery-interface.h>
#include <dali/internal/event/images/image-impl.h>
#include <dali/internal/event/images/buffer-image-impl.h>
#include <dali/internal/event/images/context-recovery-interface.h>
#include <dali/internal/event/images/image-impl.h>
#include <dali/internal/event/images/buffer-image-impl.h>
@@
-64,20
+64,27
@@
public:
void Clear( const Vector4& color );
/**
void Clear( const Vector4& color );
/**
- * @copydoc Dali::Atlas::Upload( const BufferImage&, u
nsigned int, unsigned in
t )
+ * @copydoc Dali::Atlas::Upload( const BufferImage&, u
int32_t, uint32_
t )
*/
bool Upload( BufferImage& bufferImage,
SizeType xOffset,
SizeType yOffset );
/**
*/
bool Upload( BufferImage& bufferImage,
SizeType xOffset,
SizeType yOffset );
/**
- * @copydoc Dali::Atlas::Upload( const std::string&, u
nsigned int, unsigned in
t )
+ * @copydoc Dali::Atlas::Upload( const std::string&, u
int32_t, uint32_
t )
*/
bool Upload( const std::string& url,
SizeType xOffset,
SizeType yOffset );
/**
*/
bool Upload( const std::string& url,
SizeType xOffset,
SizeType yOffset );
/**
+ * @copydoc Dali::Atlas::Upload( Dali::PixelData, uint32_t, uint32_t )
+ */
+ bool Upload( PixelDataPtr pixelData,
+ SizeType xOffset,
+ SizeType yOffset );
+
+ /**
* @copydoc ContextRecoveryInterface::RecoverFromContextLoss
*/
virtual void RecoverFromContextLoss();
* @copydoc ContextRecoveryInterface::RecoverFromContextLoss
*/
virtual void RecoverFromContextLoss();
@@
-118,11
+125,10
@@
private:
/**
* Helper for Upload methods
/**
* Helper for Upload methods
- * @return True if the
bitmap has the same pixel format and its size
fits within the atlas at the specified offset
+ * @return True if the
size of the bitmap
fits within the atlas at the specified offset
*/
*/
- bool Compatible( Pixel::Format pixelFormat,
- SizeType x,
- SizeType y );
+ bool IsInside( SizeType x, SizeType y );
+
/**
* Helper to create the Atlas resource
*/
/**
* Helper to create the Atlas resource
*/