utc-Dali-FontClient.cpp
utc-Dali-GifLoader.cpp
utc-Dali-IcoLoader.cpp
+ utc-Dali-BmpLoader.cpp
utc-Dali-ImageOperations.cpp
utc-Dali-Internal-PixelBuffer.cpp
utc-Dali-Lifecycle-Controller.cpp
/*
- * 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.
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 );
}
}
/*
- * 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.
unsigned int reportedWidth;
unsigned int reportedHeight;
unsigned int refBufferSize;
- Dali::PixelBuffer* const refBuffer;
+ Dali::PixelBuffer* refBuffer;
private:
--- /dev/null
+/*
+ * 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <iostream>
+#include <stdlib.h>
+#include <dali-test-suite-utils.h>
+
+#include "platform-abstractions/tizen/image-loaders/loader-bmp.h"
+#include "image-loaders.h"
+
+using namespace Dali;
+
+namespace
+{
+
+static const LoadFunctions BmpLoaders( TizenPlatform::LoadBmpHeader, TizenPlatform::LoadBitmapFromBmp );
+
+} // Unnamed namespace.
+
+int UtcDaliBmp24bpp(void)
+{
+ ImageDetails image( TEST_IMAGE_DIR "/flag-24bpp.bmp", 32u, 32u );
+
+ TestImageLoading( image, BmpLoaders );
+
+ END_TEST;
+}
+
{
pixels = bitmap.GetPackedPixelsProfile()->ReserveBuffer(pixelFormat, infoHeader.width, infoHeader.height);
}
+ else
+ {
+ pixelBufferW = infoHeader.width;
+ pixelBufferH = infoHeader.height;
+ newPixelFormat = pixelFormat;
+ }
break;
}