X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fimages%2Fatlas-impl.h;h=d7e704b13112c7be07957e1044387e9c22cafa10;hb=b957389f498b906edc927d225502ab08851f25c2;hp=4bb2ce2997d46153c85dccf6b6247b2d5fa55c5e;hpb=9b097e426b9c7caabab21035ac3d3b84f2562f25;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/event/images/atlas-impl.h b/dali/internal/event/images/atlas-impl.h
index 4bb2ce2..d7e704b 100644
--- 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>
-#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>
@@ -64,20 +64,27 @@ public:
   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();
@@ -118,11 +125,10 @@ private:
 
   /**
    * 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
    */