Merge "Updates following 'Rename BitmapImage as BufferImage'" into tizen

Adeel Kazmi · Gerrit Code Review
2 parents 4f875512 883a6b83
Showing 3 changed files with 8 additions and 9 deletions
demo/dali-table-view.cpp
demo/dali-table-view.h
examples/item-view/item-view-example.cpp
@@ -685,7 +685,7 @@ void DaliTableView::OnKeyEvent( const KeyEvent&amp; event )
 void DaliTableView::SetupBackground( Actor bubbleContainer, Actor backgroundLayer, const Vector2& size )
 {
   // Create distance field shape.
-  BitmapImage distanceField;
+  BufferImage distanceField;
   Size imageSize( 512, 512 );
   CreateShapeImage( CIRCLE, imageSize, distanceField );
@@ -703,7 +703,7 @@ void DaliTableView::SetupBackground( Actor bubbleContainer, Actor backgroundLaye
   AddBackgroundActors( bubbleContainer, NUM_BACKGROUND_IMAGES, distanceField, size );
 }
-void DaliTableView::AddBackgroundActors( Actor layer, int count, BitmapImage distanceField, const Dali::Vector2& size )
+void DaliTableView::AddBackgroundActors( Actor layer, int count, BufferImage distanceField, const Dali::Vector2& size )
 {
   for( int i = 0; i < count; ++i )
   {
@@ -751,10 +751,10 @@ void DaliTableView::AddBackgroundActors( Actor layer, int count, BitmapImage dis
   }
 }
-void DaliTableView::CreateShapeImage( ShapeType shapeType, const Size& size, BitmapImage& distanceFieldOut )
+void DaliTableView::CreateShapeImage( ShapeType shapeType, const Size& size, BufferImage& distanceFieldOut )
 {
   // this bitmap will hold the alpha map for the distance field shader
-  distanceFieldOut = BitmapImage::New( size.width, size.height, Pixel::A8 );
+  distanceFieldOut = BufferImage::New( size.width, size.height, Pixel::A8 );
   // Generate bit pattern
   std::vector< unsigned char > imageDataA8;
@@ -288,17 +288,16 @@ private: // Application callbacks &amp; implementation
    * @param[in] distanceField The distance field bitmap to use
    * @param[in] size The size of the actor
    */
-  void AddBackgroundActors( Dali::Actor layer, int count, Dali::BitmapImage distanceField, const Dali::Vector2& size );
+  void AddBackgroundActors( Dali::Actor layer, int count, Dali::BufferImage distanceField, const Dali::Vector2& size );
   /**
    * Create a bitmap with the specified shape and also output a distance field
    *
    * @param[in] shapeType The shape to generate
    * @param[in] size The size of the bitmap to create
-   * @param[out] imageOut The return bitmap
    * @param[out] distanceFieldOut The return depth field alpha map
    */
-  void CreateShapeImage( ShapeType shapeType, const Dali::Size& size, Dali::BitmapImage& distanceFieldOut );
+  void CreateShapeImage( ShapeType shapeType, const Dali::Size& size, Dali::BufferImage& distanceFieldOut );
   /**
    * Generate a square bit pattern and depth field
@@ -342,7 +342,7 @@ public:
     SetLayoutImage();
     // Store one 1x1 white image for multiple items to share for backgrounds:
-    mWhiteImage = BitmapImage::WHITE();
+    mWhiteImage = BufferImage::WHITE();
   }
   Actor OnKeyboardPreFocusChange( Actor current, Actor proposed, Control::KeyboardFocusNavigationDirection direction )
@@ -1124,7 +1124,7 @@ private:
   unsigned int mAlphaFuncIndex;
   TextView mAlphaFunctionText;
-  BitmapImage mWhiteImage;
+  BufferImage mWhiteImage;
 };
 void RunTest(Application& app)