#include "loader-gif.h"
#include <gif_lib.h>
+#include <cstdlib>
#include <dali/integration-api/debug.h>
-#include <adaptors/devel-api/adaptor-framework/pixel-buffer.h>
-#include <memory>
+#include <dali/integration-api/bitmap.h>
// We need to check if giflib has the new open and close API (including error parameter).
#ifdef GIFLIB_MAJOR
namespace Dali
{
+using Integration::Bitmap;
+using Dali::Integration::PixelBuffer;
namespace TizenPlatform
{
GifFileType*& gifInfo;
};
+// Simple class to enforce clean-up of PixelBuffer
+struct AutoDeleteBuffer
+{
+ AutoDeleteBuffer( PixelBuffer* _buffer )
+ : buffer( _buffer )
+ {
+ }
+
+ ~AutoDeleteBuffer()
+ {
+ delete []buffer;
+ }
+
+ PixelBuffer* buffer;
+};
+
// Used in the GIF interlace algorithm to determine the starting byte and the increment required
// for each pass.
struct InterlacePair
}
/// Decode the GIF image.
-bool DecodeImage( GifFileType* gifInfo, unsigned char* decodedData, const unsigned int width, const unsigned int height, const unsigned int bytesPerRow )
+bool DecodeImage( GifFileType* gifInfo, PixelBuffer* decodedData, const unsigned int width, const unsigned int height, const unsigned int bytesPerRow )
{
if ( gifInfo->Image.Interlace )
{
{
for( unsigned int currentByte = interlacePairPtr->startingByte; currentByte < height; currentByte += interlacePairPtr->incrementalByte )
{
- unsigned char* row = decodedData + currentByte * bytesPerRow;
+ PixelBuffer* row = decodedData + currentByte * bytesPerRow;
if ( DGifGetLine( gifInfo, row, width ) == GIF_ERROR )
{
DALI_LOG_ERROR( "GIF Loader: Error reading Interlaced GIF\n" );
else
{
// Non-interlace does not require any erratic reading / jumping.
- unsigned char* decodedDataPtr( decodedData );
+ PixelBuffer* decodedDataPtr( decodedData );
for ( unsigned int row = 0; row < height; ++row )
{
}
/// Called when we want to handle IMAGE_DESC_RECORD_TYPE
-bool HandleImageDescriptionRecordType( Dali::Devel::PixelBuffer& bitmap, GifFileType* gifInfo, unsigned int width, unsigned int height, bool& finished )
+bool HandleImageDescriptionRecordType( Bitmap& bitmap, GifFileType* gifInfo, unsigned int width, unsigned int height, bool& finished )
{
if ( DGifGetImageDesc( gifInfo ) == GIF_ERROR )
{
return false;
}
- Pixel::Format pixelFormat( Pixel::RGB888 );
-
SavedImage* image( &gifInfo->SavedImages[ gifInfo->ImageCount - 1 ] );
const GifImageDesc& desc( image->ImageDesc );
- auto decodedData = new unsigned char[ width * height * sizeof( GifPixelType ) ];
-
- std::unique_ptr<unsigned char[]> ptr{ decodedData };
+ // Create a buffer to store the decoded data.
+ PixelBuffer* decodedData( new PixelBuffer[ width * height * sizeof( GifPixelType ) ] );
+ AutoDeleteBuffer autoDeleteBuffer( decodedData );
const unsigned int bytesPerRow( width * sizeof( GifPixelType ) );
const unsigned int actualWidth( desc.Width );
const unsigned int actualHeight( desc.Height );
- // Create a buffer to store the decoded data.
- bitmap = Dali::Devel::PixelBuffer::New( actualWidth, actualHeight, pixelFormat );
-
// Decode the GIF Image
if ( !DecodeImage( gifInfo, decodedData, actualWidth, actualHeight, bytesPerRow ) )
{
// If it's an animated GIF, we still only read the first image
// Create and populate pixel buffer.
- auto pixels = bitmap.GetBuffer();
+
+ Pixel::Format pixelFormat( Pixel::RGB888 );
+ PixelBuffer *pixels = bitmap.GetPackedPixelsProfile()->ReserveBuffer( pixelFormat, actualWidth, actualHeight );
+
for (unsigned int row = 0; row < actualHeight; ++row)
{
for (unsigned int column = 0; column < actualWidth; ++column)
pixels += 3;
}
}
+
finished = true;
+
return true;
}
return LoadGifHeader(fp, width, height, &gifInfo);
}
-bool LoadBitmapFromGif( const ImageLoader::Input& input, Dali::Devel::PixelBuffer& bitmap )
+bool LoadBitmapFromGif( const ImageLoader::Input& input, Integration::Bitmap& bitmap )
{
FILE* const fp = input.file;
// Load the GIF Header file.