// CLASS HEADER
#include <dali/internal/event/images/encoded-buffer-image-impl.h>
+// EXTERNAL INCLUDES
+#include <cstring> // for memcpy
+
// INTERNAL INCLUDES
#include <dali/public-api/object/type-registry.h>
#include <dali/internal/event/common/thread-local-storage.h>
} // unnamed namespace
EncodedBufferImagePtr EncodedBufferImage::New( const uint8_t * const encodedImage,
- const std::size_t encodedImageByteCount,
- const ImageAttributes& attributes,
- const ReleasePolicy releasePol )
+ std::size_t encodedImageByteCount,
+ ImageDimensions size, FittingMode::Type fittingMode, SamplingMode::Type samplingMode,
+ bool orientationCorrection )
{
DALI_ASSERT_DEBUG( encodedImage && "Null image pointer passed-in for decoding from memory." );
DALI_ASSERT_DEBUG( encodedImageByteCount > 0U && "Zero size passed for image resource in memory buffer." );
// input buffer by reading both ends of it:
DALI_ASSERT_ALWAYS( static_cast<int>( encodedImage[0] + encodedImage[encodedImageByteCount-1] ) != -1 );
- EncodedBufferImagePtr image( new EncodedBufferImage( releasePol ) );
+ EncodedBufferImagePtr image( new EncodedBufferImage() );
image->Initialize(); // Second stage initialization
// Replicate the functionality of ImageFactory::load() without the filesystem caching:
- Dali::Integration::BitmapResourceType resourceType( attributes );
+ Dali::Integration::BitmapResourceType resourceType( size, fittingMode, samplingMode, orientationCorrection );
RequestBufferPtr buffer( new RequestBuffer );
buffer->GetVector().Resize( encodedImageByteCount );
// Resize() won't throw on failure, so avoid a SEGV if the allocation failed:
memcpy( &(buffer->GetVector()[0]), encodedImage, encodedImageByteCount );
// Get image size from buffer
- Vector2 size;
- Internal::ThreadLocalStorage::Get().GetPlatformAbstraction().GetClosestImageSize( buffer, attributes, size );
- image->mWidth = (unsigned int) size.width;
- image->mHeight = (unsigned int) size.height;
+ Dali::Integration::PlatformAbstraction& platformAbstraction = Internal::ThreadLocalStorage::Get().GetPlatformAbstraction();
+ const ImageDimensions expectedSize = platformAbstraction.GetClosestImageSize( buffer, size, fittingMode, samplingMode, orientationCorrection );
+ image->mWidth = (unsigned int) expectedSize.GetWidth();
+ image->mHeight = (unsigned int) expectedSize.GetHeight();
- ResourceClient &resourceClient = ThreadLocalStorage::Get().GetResourceClient();
- ResourceTicketPtr ticket = resourceClient.DecodeResource( resourceType, buffer );
- if( ticket )
- {
- DALI_ASSERT_DEBUG( dynamic_cast<ImageTicket*>( ticket.Get() ) && "Resource ticket returned for image resource has to be an ImageTicket subclass.\n" );
- ImageTicket * const imageTicket = static_cast<ImageTicket*>( ticket.Get() );
+ // Load the image synchronously
+ Integration::BitmapPtr bitmap = platformAbstraction.DecodeBuffer( resourceType, &(buffer->GetVector()[0]), encodedImageByteCount );
- image->mTicket = imageTicket;
- imageTicket->AddObserver( *image );
+ if( bitmap )
+ {
+ ResourceClient &resourceClient = ThreadLocalStorage::Get().GetResourceClient();
+ image->mTicket = resourceClient.AddBitmapImage( bitmap.Get() );
+ image->mTicket->AddObserver( *image );
}
return image;