/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <dali-test-suite-utils.h>
-class StubImageLoaderClient : public Dali::TizenPlatform::ResourceLoadingClient
-{
-public:
- StubImageLoaderClient() {}
- ~StubImageLoaderClient() {}
-
- virtual void InterruptionPoint() const {}
-};
-
AutoCloseFile::AutoCloseFile( FILE *fp )
: filePtr( fp )
{
height( _height ),
reportedWidth( _width ),
reportedHeight( _height ),
- refBufferSize( _width * _height ),
- refBuffer( new Dali::PixelBuffer[ refBufferSize ] )
+ refBufferSize( 0u ),
+ refBuffer( nullptr )
{
LoadBuffer();
}
height( _height ),
reportedWidth( _reportedWidth ),
reportedHeight( _reportedHeight ),
- refBufferSize( _width * _height ),
- refBuffer( new Dali::PixelBuffer[ refBufferSize ] )
+ refBufferSize( 0u ),
+ refBuffer( nullptr )
{
LoadBuffer();
}
ImageDetails::~ImageDetails()
{
- delete [] refBuffer;
+ if( refBuffer )
+ {
+ delete[] refBuffer;
+ }
}
void ImageDetails::LoadBuffer()
{
// Load the reference buffer from the buffer file
-
std::string refBufferFilename( name + ".buffer" );
FILE *fp = fopen ( refBufferFilename.c_str(), "rb" );
AutoCloseFile autoCloseBufferFile( fp );
if ( fp )
{
+ fseek( fp, 0, SEEK_END );
+ refBufferSize = ftell( fp );
+ fseek( fp, 0, SEEK_SET );
+ refBuffer = reinterpret_cast<Dali::PixelBuffer*>( malloc( refBufferSize ) );
fread( refBuffer, sizeof( Dali::PixelBuffer ), refBufferSize, fp );
}
}
Dali::Integration::BitmapPtr bitmapPtr( bitmap );
// Load Bitmap and check its return values.
- DALI_TEST_CHECK( functions.loader( StubImageLoaderClient(), input, *bitmap ) );
+ DALI_TEST_CHECK( functions.loader( input, *bitmap ) );
DALI_TEST_EQUALS( image.width, bitmap->GetImageWidth(), TEST_LOCATION );
DALI_TEST_EQUALS( image.height, bitmap->GetImageHeight(), TEST_LOCATION );
Dali::Integration::BitmapPtr bitmapPointer( bitmap );
// Load Bitmap and check its return values.
- DALI_TEST_CHECK( functions.loader( StubImageLoaderClient(), input, *bitmap ) );
+ DALI_TEST_CHECK( functions.loader( input, *bitmap ) );
DALI_TEST_EQUALS( image.width, bitmap->GetImageWidth(), TEST_LOCATION );
DALI_TEST_EQUALS( image.height, bitmap->GetImageHeight(), TEST_LOCATION );
Dali::Integration::BitmapPtr bitmapPtr( bitmap );
const Dali::TizenPlatform::ImageLoader::Input input( fp );
- DALI_TEST_CHECK( functions.loader( StubImageLoaderClient(), input, *bitmap ) );
+ DALI_TEST_CHECK( functions.loader( input, *bitmap ) );
Dali::PixelBuffer* bufferPtr( bitmapPtr->GetBuffer() );