// 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>
void Clear( const Vector4& color );
/**
- * @copydoc Dali::Atlas::Upload( const BufferImage&, unsigned int, unsigned int )
+ * @copydoc Dali::Atlas::Upload( const BufferImage&, uint32_t, uint32_t )
*/
bool Upload( BufferImage& bufferImage,
SizeType xOffset,
SizeType yOffset );
/**
- * @copydoc Dali::Atlas::Upload( const std::string&, unsigned int, unsigned int )
+ * @copydoc Dali::Atlas::Upload( const std::string&, uint32_t, uint32_t )
*/
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();
/**
* 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
*/