Exposing Exif Image metadata

[platform/core/uifw/dali-adaptor.git] / automated-tests / src / dali-platform-abstraction / utc-image-fitting-modes.cpp

diff --git a/automated-tests/src/dali-platform-abstraction/utc-image-fitting-modes.cpp b/automated-tests/src/dali-platform-abstraction/utc-image-fitting-modes.cpp
index 477c1d4..ab074dd 100644 (file)
--- a/automated-tests/src/dali-platform-abstraction/utc-image-fitting-modes.cpp
+++ b/automated-tests/src/dali-platform-abstraction/utc-image-fitting-modes.cpp
@@ -37,13 +37,13 @@ const char* ASCII_PAD_VALUE = ANSI_BLUE "#";
 typedef unsigned char PixelBuffer;
 
 
-void FillBitmap( BitmapPtr bitmap )
+void FillBitmap( Dali::Devel::PixelBuffer bitmap )
 {
   // Fill the given bitmap fully.
-  const Pixel::Format pixelFormat = bitmap->GetPixelFormat();
+  const Pixel::Format pixelFormat = bitmap.GetPixelFormat();
   const unsigned int bytesPerPixel = Pixel::GetBytesPerPixel( pixelFormat );
-  PixelBuffer * const targetPixels = bitmap->GetBuffer();
-  const int bytesToFill = bitmap.Get()->GetImageWidth() * bitmap.Get()->GetImageHeight() * bytesPerPixel;
+  PixelBuffer * const targetPixels = bitmap.GetBuffer();
+  const int bytesToFill = bitmap.GetWidth() * bitmap.GetHeight() * bytesPerPixel;
 
   memset( targetPixels, BORDER_FILL_VALUE, bytesToFill );
 }
@@ -97,16 +97,15 @@ void PerformFittingTests( TestContainer& tests )
     // Create a source bitmap.
     ImageDimensions desiredDimensions( desiredWidth, desiredHeight );
     SamplingMode::Type samplingMode = SamplingMode::BOX_THEN_LINEAR;
-    BitmapPtr sourceBitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD );
-    Integration::Bitmap::PackedPixelsProfile *packedView = sourceBitmap->GetPackedPixelsProfile();
-    const Pixel::Format pixelFormat = sourceBitmap->GetPixelFormat();
-    packedView->ReserveBuffer( pixelFormat, sourceWidth, sourceHeight, sourceWidth, sourceHeight );
 
+
+    auto sourceBitmap = Dali::Devel::PixelBuffer::New( sourceWidth, sourceHeight, Pixel::Format::RGBA8888 );
+    const Pixel::Format pixelFormat = sourceBitmap.GetPixelFormat();
     // Completely fill the source bitmap (with white).
     FillBitmap( sourceBitmap );
 
     // Perform fitting operations (this is the method we are testing).
-    BitmapPtr newBitmap = ApplyAttributesToBitmap( sourceBitmap, desiredDimensions, fittingMode, samplingMode );
+    auto newBitmap = ApplyAttributesToBitmap( sourceBitmap, desiredDimensions, fittingMode, samplingMode );
 
     DALI_TEST_CHECK( newBitmap );
 
@@ -116,16 +115,16 @@ void PerformFittingTests( TestContainer& tests )
       return;
     }
 
-    Bitmap *bitmap = newBitmap.Get();
+    auto bitmap( newBitmap );
 
-    unsigned int resultWidth = bitmap->GetImageWidth();
-    unsigned int resultHeight = bitmap->GetImageHeight();
+    unsigned int resultWidth = bitmap.GetWidth();
+    unsigned int resultHeight = bitmap.GetHeight();
 
     // Check the dimensions of the modified image match against the expected values defined in the test.
     DALI_TEST_EQUALS( resultWidth, test.expectedWidth, TEST_LOCATION );
     DALI_TEST_EQUALS( resultHeight, test.expectedHeight, TEST_LOCATION );
 
-    PixelBuffer* resultBuffer = bitmap->GetBuffer();
+    PixelBuffer* resultBuffer = bitmap.GetBuffer();
     const unsigned int bytesPerPixel = Pixel::GetBytesPerPixel( pixelFormat );
 
     // We generate an ASCII representation of the source, desired and result images to log, purely as a debugging aid.