Bitmap core patch 2 of 4 - Replace all uses of the Bitmap class with new simpler...

[platform/core/uifw/dali-core.git] / automated-tests / src / dali / dali-test-suite-utils / test-platform-abstraction.cpp

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp
index 27e806e..7938835 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp
@@ -187,21 +187,21 @@ const PixelSize TestPlatformAbstraction::GetFontLineHeightFromCapsHeight(const s
 
 Integration::GlyphSet* TestPlatformAbstraction::GetGlyphData ( const Integration::TextResourceType& textRequest,
                                                                const std::string& fontFamily,
-                                                               bool getBitmap) const
+                                                               bool getImageData) const
 {
-  if( getBitmap )
+  if( getImageData )
   {
-    mTrace.PushCall("GetGlyphData", "getBitmap:true");
+    mTrace.PushCall("GetGlyphData", "getImageData:true");
   }
   else
   {
-    mTrace.PushCall("GetGlyphData", "getBitmap:false");
+    mTrace.PushCall("GetGlyphData", "getImageData:false");
   }
 
   // It creates fake metrics for the received characters.
 
   Integration::GlyphSet* set = new Dali::Integration::GlyphSet();
-  Integration::BitmapPtr bitmapData;
+  Integration::ImageDataPtr imageData;
 
   std::set<uint32_t> characters;
 
@@ -212,15 +212,15 @@ Integration::GlyphSet* TestPlatformAbstraction::GetGlyphData ( const Integration
       characters.insert( it->character );
       Integration::GlyphMetrics character = {it->character, Integration::GlyphMetrics::LOW_QUALITY,  10.0f,  10.0f, 9.0f, 1.0f, 10.0f, it->xPosition, it->yPosition };
 
-      if( getBitmap )
+      if( getImageData )
       {
-        bitmapData = Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, true);
-        bitmapData->GetPackedPixelsProfile()->ReserveBuffer(Pixel::A8, 64, 64);
-        PixelBuffer* pixelBuffer = bitmapData->GetBuffer();
-        memset( pixelBuffer, it->character, 64*64 );
+        // Allocate an ImageData object to hold some pixels:
+        const unsigned dimension = 64;
+        imageData = Integration::NewBitmapImageData( dimension, dimension, Pixel::A8 );
+        uint8_t* const pixelBuffer = imageData->GetBuffer();
+        memset( pixelBuffer, it->character, dimension * dimension );
       }
-
-      set->AddCharacter(bitmapData, character);
+      set->AddCharacter(imageData, character);
     }
   }
 
@@ -244,7 +244,7 @@ Integration::GlyphSet* TestPlatformAbstraction::GetCachedGlyphData( const Integr
 
   // It creates fake metrics and bitmap for received numeric characters '0' through '9'.
   Integration::GlyphSet* set = new Dali::Integration::GlyphSet();
-  Integration::BitmapPtr bitmapData;
+  Integration::ImageDataPtr imageData;
 
   std::set<uint32_t> characters;
 
@@ -255,11 +255,10 @@ Integration::GlyphSet* TestPlatformAbstraction::GetCachedGlyphData( const Integr
       characters.insert( it->character );
       Integration::GlyphMetrics character = {it->character, Integration::GlyphMetrics::HIGH_QUALITY,  10.0f,  10.0f, 9.0f, 1.0f, 10.0f, it->xPosition, it->yPosition };
 
-      bitmapData = Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, true);
-      bitmapData->GetPackedPixelsProfile()->ReserveBuffer(Pixel::A8, 64, 64);
-      PixelBuffer* pixelBuffer = bitmapData->GetBuffer();
+      imageData = Integration::NewBitmapImageData( 64, 64, Pixel::A8 );
+      PixelBuffer* pixelBuffer = imageData->GetBuffer();
       memset( pixelBuffer, it->character, 64*64 );
-      set->AddCharacter(bitmapData, character);
+      set->AddCharacter(imageData, character);
     }
   }
 
@@ -442,10 +441,9 @@ void TestPlatformAbstraction::GetFileNamesFromDirectory( const std::string& dire
 }
 
 
-Integration::BitmapPtr TestPlatformAbstraction::GetGlyphImage( const std::string& fontFamily, const std::string& fontStyle, float fontSize, uint32_t character ) const
+Integration::ImageDataPtr TestPlatformAbstraction::GetGlyphImage( const std::string& fontFamily, const std::string& fontStyle, float fontSize, uint32_t character ) const
 {
-  Integration::BitmapPtr image = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, true );
-  image->GetPackedPixelsProfile()->ReserveBuffer( Pixel::RGBA8888, 1, 1 );
+  Integration::ImageDataPtr image = Integration::NewBitmapImageData( 1, 1, Pixel::RGBA8888 );
 
   mTrace.PushCall("GetGlyphImage", "");