From: Xiangyin Ma <x1.ma@samsung.com>
Date: Mon, 23 Feb 2015 17:02:23 +0000 (+0000)
Subject: Updates following 'Rename BitmapImage as BufferImage'
X-Git-Tag: dali_1.0.32~10^2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=90b76ea06a1d553df0840f7dde4437ff242320f3;ds=sidebyside

Updates following 'Rename BitmapImage as BufferImage'

Change-Id: I33b87c5e3f5e23ee134fe93c7f5e2c5205a9448f
---

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp
index 8ceaed3..cc16ab0 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.cpp
@@ -323,9 +323,9 @@ void ConstraintAppliedCheck::CheckSignalNotReceived()
   }
 }
 
-BitmapImage CreateBitmapImage(int width, int height, const Vector4& color)
+BufferImage CreateBufferImage(int width, int height, const Vector4& color)
 {
-  BitmapImage image = BitmapImage::New(width, height, Pixel::RGBA8888);
+  BufferImage image = BufferImage::New(width, height, Pixel::RGBA8888);
 
   PixelBuffer* pixbuf = image.GetBuffer();
 
@@ -342,7 +342,7 @@ BitmapImage CreateBitmapImage(int width, int height, const Vector4& color)
   return image;
 }
 
-BitmapImage CreateBitmapImage()
+BufferImage CreateBufferImage()
 {
-  return CreateBitmapImage(4, 4, Color::WHITE);
+  return CreateBufferImage(4, 4, Color::WHITE);
 }
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
index 473a029..98fc629 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/dali-test-suite-utils.h
@@ -396,8 +396,8 @@ struct DefaultFunctionCoverage
 
 
 // Helper to Create bitmap image
-BitmapImage CreateBitmapImage();
-BitmapImage CreateBitmapImage(int width, int height, const Vector4& color);
+BufferImage CreateBufferImage();
+BufferImage CreateBufferImage(int width, int height, const Vector4& color);
 
 
 #endif // __DALI_TEST_SUITE_UTILS_H__
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h
index e8e4466..8722ab3 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-test-application.h
@@ -62,7 +62,7 @@ private:
 
 inline ImageActor CreateSolidColorImageActor(ToolkitTestApplication& application, const Vector4& color, int width, int height)
 {
-  ImageActor actor = ImageActor::New(CreateBitmapImage(width, height, color));
+  ImageActor actor = ImageActor::New(CreateBufferImage(width, height, color));
   application.SendNotification();
   application.Render();
   return actor;
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BendyEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BendyEffect.cpp
index a785f6f..426afda 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-BendyEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-BendyEffect.cpp
@@ -77,7 +77,7 @@ int UtcDaliBendyDefaultValuesEffect(void)
   Toolkit::BendyEffect effect = Toolkit::BendyEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -115,7 +115,7 @@ int UtcDaliBendyCustomValuesEffect(void)
   Toolkit::BendyEffect effect = Toolkit::BendyEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BlindEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BlindEffect.cpp
index c19f7be..d9d5be4 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-BlindEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-BlindEffect.cpp
@@ -76,7 +76,7 @@ int UtcDaliBlindEffectDefaultValues(void)
   Toolkit::BlindEffect effect = Toolkit::BlindEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -101,7 +101,7 @@ int UtcDaliBlindEffectCustomValues(void)
   Toolkit::BlindEffect effect = Toolkit::BlindEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
index 187f990..b15d1e6 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp
@@ -75,7 +75,7 @@ static int Wait(ToolkitTestApplication& application, int duration = 0)
 
 static Image CreateSolidColorImage( ToolkitTestApplication& application, const Vector4& color, unsigned int width, unsigned int height )
 {
-  BitmapImage imageData = BitmapImage::New( width, height, Pixel::RGBA8888 );
+  BufferImage imageData = BufferImage::New( width, height, Pixel::RGBA8888 );
 
   // Create the image
   PixelBuffer* pixbuf = imageData.GetBuffer();
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
index 69948df..3a6900e 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
@@ -133,7 +133,7 @@ int UtcDaliButtonSize(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliButtonSize");
 
-  ImageActor image01 = ImageActor::New(CreateBitmapImage());
+  ImageActor image01 = ImageActor::New(CreateBufferImage());
   image01.SetSize( 100, 50 );
 
   PushButton pushButton;
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CarouselEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CarouselEffect.cpp
index 07e3c9f..8d6367a 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-CarouselEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-CarouselEffect.cpp
@@ -76,7 +76,7 @@ int UtcDaliCarouselEffectDefaultValues(void)
   Toolkit::CarouselEffect effect = Toolkit::CarouselEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -105,7 +105,7 @@ int UtcDaliCarouselEffectCustomValues(void)
   Toolkit::CarouselEffect effect = Toolkit::CarouselEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
index 6892c84..32bb9de 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-CheckBoxButton.cpp
@@ -37,7 +37,7 @@ bool CheckBoxButtonClicked( Button button )
 
 Image CreateSolidColorImage( const Vector4& color, unsigned int width, unsigned int height )
 {
-  BitmapImage imageData = BitmapImage::New( width, height, Pixel::RGBA8888 );
+  BufferImage imageData = BufferImage::New( width, height, Pixel::RGBA8888 );
 
   // Create the image
   PixelBuffer* pixbuf = imageData.GetBuffer();
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp
index 9811d1e..185940d 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-CubeTransitionEffect.cpp
@@ -53,7 +53,7 @@ static void TestCallback(BaseHandle handle)
 void Wait(ToolkitTestApplication& application, float durationToPass)
 {
   int duration = static_cast<int>(durationToPass*1000.f);
-  // wait 2 more frames to compensate the two frames used by the bitmapImage waiting for the loading succeeded signal
+  // wait 2 more frames to compensate the two frames used by the image waiting for the loading succeeded signal
   for(int i = 0; i <=  duration/RENDER_FRAME_INTERVAL+2 ; i++)
   {
     application.SendNotification();
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp
index 87cb936..66a3664 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp
@@ -81,7 +81,7 @@ int UtcDaliDissolveDefaultValuesEffect(void)
   Toolkit::DissolveEffect effect = Toolkit::DissolveEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -106,7 +106,7 @@ int UtcDaliDissolveCustomValuesEffect(void)
   Toolkit::DissolveEffect effect = Toolkit::DissolveEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -133,10 +133,10 @@ int UtcDaliSetEffectImageEffect(void)
   Toolkit::DissolveEffect effect = Toolkit::DissolveEffect::New();
   DALI_TEST_CHECK( effect );
 
-  Image effectImage = CreateBitmapImage();
+  Image effectImage = CreateBufferImage();
   effect.SetEffectImage(effectImage);
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-DistanceFieldEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-DistanceFieldEffect.cpp
index e0e5109..570793c 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-DistanceFieldEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-DistanceFieldEffect.cpp
@@ -34,11 +34,11 @@ void utc_distance_field_effect_cleanup(void)
 
 namespace
 {
-// Create bitmap image
-BitmapImage CreateDistanceField()
+// Create buffer image
+BufferImage CreateDistanceField()
 {
-  BitmapImage image = BitmapImage::New(256, 256, Pixel::RGBA8888);
-  BitmapImage distanceFieldImage = BitmapImage::New(256, 256, Pixel::L8);
+  BufferImage image = BufferImage::New(256, 256, Pixel::RGBA8888);
+  BufferImage distanceFieldImage = BufferImage::New(256, 256, Pixel::L8);
 
   PixelBuffer* pixbuf = image.GetBuffer();
 
@@ -112,7 +112,7 @@ int UtcDaliDistanceFieldEffectDefaultValues(void)
   Toolkit::DistanceFieldEffect effect = Toolkit::DistanceFieldEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateDistanceField();
+  BufferImage image = CreateDistanceField();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -146,7 +146,7 @@ int UtcDaliDistanceFieldEffectCustomValues(void)
   Toolkit::DistanceFieldEffect effect = Toolkit::DistanceFieldEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateDistanceField();
+  BufferImage image = CreateDistanceField();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-IrisEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-IrisEffect.cpp
index 7fdc669..002601d 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-IrisEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-IrisEffect.cpp
@@ -80,7 +80,7 @@ int UtcDaliIrisEffectDefaultValues(void)
   Toolkit::IrisEffect effect = Toolkit::IrisEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -109,7 +109,7 @@ int UtcDaliIrisEffectCustomValues(void)
   Toolkit::IrisEffect effect = Toolkit::IrisEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-KeyInputFocusManager.cpp b/automated-tests/src/dali-toolkit/utc-Dali-KeyInputFocusManager.cpp
index be76927..24b2fff 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-KeyInputFocusManager.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-KeyInputFocusManager.cpp
@@ -543,7 +543,7 @@ int UtcDaliKeyInputFocusManagerDestroyObject02(void)
   dummy2Impl.keyInputFocusLost = false;
 
   {
-    BitmapImage image = CreateBitmapImage();
+    BufferImage image = CreateBufferImage();
     ImageActor imageActor = ImageActor::New( image );
     stage.Add( imageActor );
     imageActor.SetSize(100, 100);
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-MaskEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-MaskEffect.cpp
index d139b9f..49c346e 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-MaskEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-MaskEffect.cpp
@@ -42,7 +42,7 @@ int UtcDaliMaskEffectCreateEffect(void)
 {
   ToolkitTestApplication application;
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ShaderEffect effect = Toolkit::MaskEffect::New( image );
   DALI_TEST_CHECK( effect );
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-NinePatchMaskEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-NinePatchMaskEffect.cpp
index f33ca00..dccba07 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-NinePatchMaskEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-NinePatchMaskEffect.cpp
@@ -42,7 +42,7 @@ int UtcDaliNinePatchMaskEffectApply(void)
 {
   ToolkitTestApplication application;
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
   ImageActor actor0 = ImageActor::New( image );
   Toolkit::NinePatchMaskEffect::Apply( actor0, "" );
 
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-OverlayEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-OverlayEffect.cpp
index 8c0ad1b..b5511ed 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-OverlayEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-OverlayEffect.cpp
@@ -39,7 +39,7 @@ int UtcDaliOverlayConstructor(void)
 {
   ToolkitTestApplication application;
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   Toolkit::OverlayEffect effect = Toolkit::OverlayEffect::New( image );
   DALI_TEST_CHECK( effect );
@@ -63,7 +63,7 @@ int UtcDaliOverlayUninitializedEffect(void)
 
   try
   {
-    BitmapImage image = CreateBitmapImage();
+    BufferImage image = CreateBufferImage();
 
     // New() must be called to create a OverlayEffect or it wont be valid.
     effect.SetEffectImage( image );
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnEffect.cpp
index 4cab338..b1d5961 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnEffect.cpp
@@ -38,7 +38,7 @@ int UtcDaliPageTurnEffectApply(void)
 {
   ToolkitTestApplication application;
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   Toolkit::PageTurnEffect pageTurnEffect = Toolkit::PageTurnEffect::New();
   Toolkit::PageTurnEffect pageTurnEffect2 = Toolkit::PageTurnEffect::New(false);
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
index 7313afc..4a2a33d 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-PushButton.cpp
@@ -75,7 +75,7 @@ const Dali::TouchPoint pointUpOutside( 0, TouchPoint::Up, 10, 10 );
 
 Image CreateSolidColorImage( const Vector4& color, unsigned int width, unsigned int height )
 {
-  BitmapImage imageData = BitmapImage::New( width, height, Pixel::RGBA8888 );
+  BufferImage imageData = BufferImage::New( width, height, Pixel::RGBA8888 );
 
   // Create the image
   PixelBuffer* pixbuf = imageData.GetBuffer();
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Ripple2DEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Ripple2DEffect.cpp
index 1c6d9f2..1fac593 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Ripple2DEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Ripple2DEffect.cpp
@@ -79,7 +79,7 @@ int UtcDaliRipple2DEffectDefaultValues(void)
   Toolkit::Ripple2DEffect effect = Toolkit::Ripple2DEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -107,7 +107,7 @@ int UtcDaliRipple2DEffectCustomValues(void)
   Toolkit::Ripple2DEffect effect = Toolkit::Ripple2DEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-RippleEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-RippleEffect.cpp
index 5b0e423..71db67d 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-RippleEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-RippleEffect.cpp
@@ -81,7 +81,7 @@ int UtcDaliRippleDefaultValuesEffect(void)
   Toolkit::RippleEffect effect = Toolkit::RippleEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -113,7 +113,7 @@ int UtcDaliRippleCustomValuesEffect(void)
   Toolkit::RippleEffect effect = Toolkit::RippleEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ShearEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ShearEffect.cpp
index 2a0c0bd..fc2d922 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ShearEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ShearEffect.cpp
@@ -95,7 +95,7 @@ int UtcDaliShearEffectDefaultValues(void)
   Toolkit::ShearEffect effect = Toolkit::ShearEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -124,7 +124,7 @@ int UtcDaliShearEffectCustomValues(void)
   Toolkit::ShearEffect effect = Toolkit::ShearEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-SpotEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-SpotEffect.cpp
index 95866cd..99a2edb 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-SpotEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-SpotEffect.cpp
@@ -75,7 +75,7 @@ int UtcDaliSpotDefaultValuesEffect(void)
   Toolkit::SpotEffect effect = Toolkit::SpotEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -105,7 +105,7 @@ int UtcDaliSpotCustomValuesEffect(void)
   Toolkit::SpotEffect effect = Toolkit::SpotEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-SquareDissolveEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-SquareDissolveEffect.cpp
index b25316e..9b8e194 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-SquareDissolveEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-SquareDissolveEffect.cpp
@@ -77,7 +77,7 @@ int UtcDaliSquareDissolveEffectDefaultValues(void)
   Toolkit::SquareDissolveEffect effect = Toolkit::SquareDissolveEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -117,7 +117,7 @@ int UtcDaliSquareDissolveEffectCustomValues(void)
   Toolkit::SquareDissolveEffect effect = Toolkit::SquareDissolveEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp
index 055d632..5fd205c 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-SuperBlurView.cpp
@@ -75,7 +75,7 @@ int Wait(ToolkitTestApplication& application, int duration = 0)
 
 Image CreateSolidColorImage( ToolkitTestApplication& application, const Vector4& color, unsigned int width, unsigned int height )
 {
-  BitmapImage imageData = BitmapImage::New( width, height, Pixel::RGBA8888 );
+  BufferImage imageData = BufferImage::New( width, height, Pixel::RGBA8888 );
 
   // Create the image
   PixelBuffer* pixbuf = imageData.GetBuffer();
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-SwirlEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-SwirlEffect.cpp
index 75e7058..debe183 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-SwirlEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-SwirlEffect.cpp
@@ -80,7 +80,7 @@ int UtcDaliSwirlDefaultValuesEffect(void)
   Toolkit::SwirlEffect effect = Toolkit::SwirlEffect::New(true);
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -115,7 +115,7 @@ int UtcDaliSwirlCustomValuesEffect(void)
   Toolkit::SwirlEffect effect = Toolkit::SwirlEffect::New(false);
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-WaterEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-WaterEffect.cpp
index 2f41d9c..8f12fb6 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-WaterEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-WaterEffect.cpp
@@ -102,7 +102,7 @@ int UtcDaliWaterEffectDefaultValues(void)
   // Check that the effect has the number of waves it was requested
   DALI_TEST_CHECK( effect.GetNumberOfWaves() == 4 );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -140,7 +140,7 @@ int UtcDaliWaterEffectCustomValues(void)
   Toolkit::WaterEffect effect = Toolkit::WaterEffect::New(4);
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -180,7 +180,7 @@ int UtcDaliWaterEffectGetAmplitudePositive(void)
   Toolkit::WaterEffect effect = Toolkit::WaterEffect::New(4);
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -205,7 +205,7 @@ int UtcDaliWaterEffectGetAmplitudeNegative(void)
   Toolkit::WaterEffect effect = Toolkit::WaterEffect::New(4);
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -231,7 +231,7 @@ int UtcDaliWaterEffectGetCenterPositive(void)
   Toolkit::WaterEffect effect = Toolkit::WaterEffect::New(4);
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -256,7 +256,7 @@ int UtcDaliWaterEffectGetCenterNegative(void)
   Toolkit::WaterEffect effect = Toolkit::WaterEffect::New(4);
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -282,7 +282,7 @@ int UtcDaliWaterEffectGetPropagationPositive(void)
   Toolkit::WaterEffect effect = Toolkit::WaterEffect::New(4);
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -307,7 +307,7 @@ int UtcDaliWaterEffectGetPropagationNegative(void)
   Toolkit::WaterEffect effect = Toolkit::WaterEffect::New(4);
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
diff --git a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
index 1d35050..1c16683 100644
--- a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
+++ b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
@@ -20,7 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/stage.h>
-#include <dali/public-api/images/image-attributes.h>
+#include <dali/public-api/images/buffer-image.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/render-tasks/render-task-list.h>
 
@@ -90,7 +90,7 @@ void CubeTransitionEffect::Initialize()
                               (-mViewAreaSize.height + mTileSize.height) * 0.5f,
                               -mTileSize.width * 0.5f );
 
-  Image placeHolder = BitmapImage::WHITE();
+  Image placeHolder = BufferImage::WHITE();
   for( unsigned int y = 0; y < mNumRows; y++ )
   {
     float positionY = y * mTileSize.height + basePosition.y;
diff --git a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h
index 57fd205..0fafab0 100644
--- a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h
+++ b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.h
@@ -20,7 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/animation/animation.h>
-#include <dali/public-api/images/bitmap-image.h>
+
 #include <dali/public-api/images/frame-buffer-image.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/render-tasks/render-task.h>
diff --git a/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp b/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp
index d122d48..1474151 100644
--- a/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp
+++ b/dali-toolkit/public-api/controls/default-controls/solid-color-actor.cpp
@@ -16,7 +16,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/images/bitmap-image.h>
+#include <dali/public-api/images/buffer-image.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
@@ -42,7 +42,7 @@ ImageActor CreateSolidColorActor( const Vector4& color, bool border, const Vecto
   }
 
   const unsigned int bitmapWidth = borderSize * 2 + 2;
-  BitmapImage imageData = BitmapImage::New( bitmapWidth, bitmapWidth, Pixel::RGBA8888 );
+  BufferImage imageData = BufferImage::New( bitmapWidth, bitmapWidth, Pixel::RGBA8888 );
 
   // Create the image
   PixelBuffer* pixbuf = imageData.GetBuffer();
diff --git a/dali-toolkit/public-api/shader-effects/bouncing-effect.h b/dali-toolkit/public-api/shader-effects/bouncing-effect.h
index f4dac3e..eebe525 100644
--- a/dali-toolkit/public-api/shader-effects/bouncing-effect.h
+++ b/dali-toolkit/public-api/shader-effects/bouncing-effect.h
@@ -33,7 +33,7 @@ namespace Toolkit
  * Usage Example:
  *
  *  // Create the an imageActor, set shader effect, and add it to the stage
- *  ImageActor imageActor = ImageActor::New( BitmapImage::New( 1, 1 ) );
+ *  ImageActor imageActor = ImageActor::New( BufferImage::New( 1, 1 ) );
  *  imageActor.SetSize(720.f,58.f);
  *  Toolkit::BouncingEffect bouncingEffect = Toolkit::BouncingEffect::New( Vector4(0.f,1.f,1.f,0.5f) );
  *  imageActor.SetShaderEffect( bouncingEffect );