Peter M. Groen / dali-demo

Commit d95db4f5031b7943e8a13e18def1819ffb79ced1

Authored by Adeel Kazmi
Committed by Gerrit Code Review
2 parents 4f875512 883a6b83

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

Inline Side-by-side
Showing 3 changed files with 8 additions and 9 deletions
demo/dali-table-view.cpp
  View file @d95db4f
... ... @@ -685,7 +685,7 @@ void DaliTableView::OnKeyEvent( const KeyEvent& event )
685 685 void DaliTableView::SetupBackground( Actor bubbleContainer, Actor backgroundLayer, const Vector2& size )
686 686 {
687 687 // Create distance field shape.
688   - BitmapImage distanceField;
  688 + BufferImage distanceField;
689 689 Size imageSize( 512, 512 );
690 690 CreateShapeImage( CIRCLE, imageSize, distanceField );
691 691  
... ... @@ -703,7 +703,7 @@ void DaliTableView::SetupBackground( Actor bubbleContainer, Actor backgroundLaye
703 703 AddBackgroundActors( bubbleContainer, NUM_BACKGROUND_IMAGES, distanceField, size );
704 704 }
705 705  
706   -void DaliTableView::AddBackgroundActors( Actor layer, int count, BitmapImage distanceField, const Dali::Vector2& size )
  706 +void DaliTableView::AddBackgroundActors( Actor layer, int count, BufferImage distanceField, const Dali::Vector2& size )
707 707 {
708 708 for( int i = 0; i < count; ++i )
709 709 {
... ... @@ -751,10 +751,10 @@ void DaliTableView::AddBackgroundActors( Actor layer, int count, BitmapImage dis
751 751 }
752 752 }
753 753  
754   -void DaliTableView::CreateShapeImage( ShapeType shapeType, const Size& size, BitmapImage& distanceFieldOut )
  754 +void DaliTableView::CreateShapeImage( ShapeType shapeType, const Size& size, BufferImage& distanceFieldOut )
755 755 {
756 756 // this bitmap will hold the alpha map for the distance field shader
757   - distanceFieldOut = BitmapImage::New( size.width, size.height, Pixel::A8 );
  757 + distanceFieldOut = BufferImage::New( size.width, size.height, Pixel::A8 );
758 758  
759 759 // Generate bit pattern
760 760 std::vector< unsigned char > imageDataA8;
... ...
demo/dali-table-view.h
  View file @d95db4f
... ... @@ -288,17 +288,16 @@ private: // Application callbacks &amp; implementation
288 288 * @param[in] distanceField The distance field bitmap to use
289 289 * @param[in] size The size of the actor
290 290 */
291   - void AddBackgroundActors( Dali::Actor layer, int count, Dali::BitmapImage distanceField, const Dali::Vector2& size );
  291 + void AddBackgroundActors( Dali::Actor layer, int count, Dali::BufferImage distanceField, const Dali::Vector2& size );
292 292  
293 293 /**
294 294 * Create a bitmap with the specified shape and also output a distance field
295 295 *
296 296 * @param[in] shapeType The shape to generate
297 297 * @param[in] size The size of the bitmap to create
298   - * @param[out] imageOut The return bitmap
299 298 * @param[out] distanceFieldOut The return depth field alpha map
300 299 */
301   - void CreateShapeImage( ShapeType shapeType, const Dali::Size& size, Dali::BitmapImage& distanceFieldOut );
  300 + void CreateShapeImage( ShapeType shapeType, const Dali::Size& size, Dali::BufferImage& distanceFieldOut );
302 301  
303 302 /**
304 303 * Generate a square bit pattern and depth field
... ...
examples/item-view/item-view-example.cpp
  View file @d95db4f
... ... @@ -342,7 +342,7 @@ public:
342 342 SetLayoutImage();
343 343  
344 344 // Store one 1x1 white image for multiple items to share for backgrounds:
345   - mWhiteImage = BitmapImage::WHITE();
  345 + mWhiteImage = BufferImage::WHITE();
346 346 }
347 347  
348 348 Actor OnKeyboardPreFocusChange( Actor current, Actor proposed, Control::KeyboardFocusNavigationDirection direction )
... ... @@ -1124,7 +1124,7 @@ private:
1124 1124  
1125 1125 unsigned int mAlphaFuncIndex;
1126 1126 TextView mAlphaFunctionText;
1127   - BitmapImage mWhiteImage;
  1127 + BufferImage mWhiteImage;
1128 1128 };
1129 1129  
1130 1130 void RunTest(Application& app)
... ...