Updates following 'Rename BitmapImage as BufferImage'

Change-Id: I4d35baba48038c146b45bf6bba761fa92457c1d4

diff --git a/adaptors/common/indicator-impl.cpp b/adaptors/common/indicator-impl.cpp
index 3cfd24d..48e926e 100644 (file)
--- a/adaptors/common/indicator-impl.cpp
+++ b/adaptors/common/indicator-impl.cpp
@@ -28,9 +28,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include <dali/public-api/images/bitmap-image.h>
 #include <dali/public-api/images/native-image.h>
-#include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/events/touch-event.h>
 #include <dali/public-api/events/touch-point.h>
 #include <dali/public-api/common/stage.h>

diff --git a/adaptors/common/indicator-impl.h b/adaptors/common/indicator-impl.h
index 5ed35a1..d499cbf 100644 (file)
--- a/adaptors/common/indicator-impl.h
+++ b/adaptors/common/indicator-impl.h
@@ -19,7 +19,6 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/images/bitmap-image.h>
 #include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/actors/mesh-actor.h>
 #include <dali/public-api/geometry/animatable-mesh.h>

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.cpp b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.cpp
index 0120195..50a968e 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.cpp
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.cpp
@@ -323,9 +323,9 @@ void ConstraintAppliedCheck::CheckSignalNotReceived()
   }
 }
 
-BitmapImage CreateBitmapImage()
+BufferImage CreateBufferImage()
 {
-  BitmapImage image = BitmapImage::New(4,4,Pixel::RGBA8888);
+  BufferImage image = BufferImage::New(4,4,Pixel::RGBA8888);
 
   PixelBuffer* pixbuf = image.GetBuffer();
 

diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h
index 13db421..eb4966e 100644 (file)
--- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h
+++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/dali-test-suite-utils.h
@@ -396,6 +396,6 @@ struct DefaultFunctionCoverage
 
 
 // Helper to Create bitmap image
-BitmapImage CreateBitmapImage();
+BufferImage CreateBufferImage();
 
 #endif // __DALI_TEST_SUITE_UTILS_H__