#include "test-platform-abstraction.h"
#include "dali-test-suite-utils.h"
-#include <dali/integration-api/bitmap.h>
+#include <dali/integration-api/image-data.h>
namespace Dali
{
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 bitmapData;
std::set<uint32_t> characters;
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);
+ bitmapData = Dali::Integration::NewBitmapImageData( 64, 64, Pixel::A8 );
PixelBuffer* pixelBuffer = bitmapData->GetBuffer();
memset( pixelBuffer, it->character, 64*64 );
}
// 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 bitmapData;
std::set<uint32_t> characters;
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);
+ bitmapData = Dali::Integration::NewBitmapImageData( 64, 64, Pixel::A8 );
PixelBuffer* pixelBuffer = bitmapData->GetBuffer();
memset( pixelBuffer, it->character, 64*64 );
set->AddCharacter(bitmapData, character);
}
-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 = Dali::Integration::NewBitmapImageData( 1, 1, Pixel::RGBA8888 );
mTrace.PushCall("GetGlyphImage", "");
-
return image;
}