/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
// INTERNAL INCLUDES
#include <dali/integration-api/debug.h>
#include <dali/integration-api/bitmap.h>
-#include <dali/public-api/images/image-attributes.h>
#include <dali/public-api/common/dali-vector.h>
namespace Dali
{
return -1;
}
- buf = ((unsigned char *) map)[(*position)++];
+ buf = reinterpret_cast< unsigned char * >( map )[(*position)++];
targetMultiByteInteger = (targetMultiByteInteger << 7) | (buf & 0x7f);
if ((buf & 0x80) == 0)
{
- DALI_LOG_INFO(gLogFilter, Debug::Verbose, "position: %d, readBufCount: %d", *position, readBufCount);
+ DALI_LOG_INFO(gLogFilter, Debug::Verbose, "position: %d, readBufCount: %d\n", *position, readBufCount);
break;
}
}
}// end unnamed namespace
-bool LoadBitmapFromWbmp( FILE *fp, Integration::Bitmap& bitmap, ImageAttributes& attributes, const ResourceLoadingClient& client )
+bool LoadBitmapFromWbmp( const ImageLoader::Input& input, Integration::Bitmap& bitmap )
{
-
+ FILE* const fp = input.file;
if(fp == NULL)
{
DALI_LOG_ERROR("Error loading bitmap\n");
PixelBuffer* pixels = NULL;
size_t position = 0;
- unsigned int w, h;
+ unsigned int w, h;
unsigned int type;
unsigned int line_length;
unsigned char *line = NULL;
- int cur = 0, x, y;
+ unsigned int cur = 0, x, y;
if( fseek(fp,0,SEEK_END) )
{
if(fread(&map[0], 1, fsize, fp) != fsize)
{
- DALI_LOG_WARNING("image file read opeation error!");
+ DALI_LOG_WARNING("image file read opeation error!\n");
return false;
}
memset(&surface[0], 0, w * h ); // w * h * 4
line_length = (w + 7) >> 3;
- for (y = 0; y < (int)h; y ++)
+ for (y = 0; y < h; y ++)
{
if (position + line_length > fsize)
{
}
line = &map[0] + position;
position += line_length;
- for (x = 0; x < (int)w; x++)
+ for (x = 0; x < w; x++)
{
int idx = x >> 3;
int offset = 1 << (0x07 - (x & 0x07));
}
pixels = bitmap.GetPackedPixelsProfile()->ReserveBuffer(Pixel::L8, w, h);//Pixel::RGBA8888
- memcpy(pixels, (unsigned char*)&surface[0], w * h );//w * h * 4
- attributes.SetSize(w, h);
+ memcpy( pixels, &surface[0], w * h ); //w * h * 4
return true;
}
-bool LoadWbmpHeader(FILE *fp, const ImageAttributes& attributes, unsigned int &width, unsigned int &height )
+bool LoadWbmpHeader( const ImageLoader::Input& input, unsigned int& width, unsigned int& height )
{
+ FILE* const fp = input.file;
if(fp == NULL)
{
DALI_LOG_ERROR("Error loading bitmap\n");
map.Resize(headerSize);
if(fread(&map[0], 1, headerSize, fp) != headerSize)
{
- DALI_LOG_WARNING("image file read opeation error!");
+ DALI_LOG_WARNING("image file read opeation error!\n");
return false;
}
- if (extractMultiByteInteger(&type, &map[0], fsize, &position) < 0)
+ if (extractMultiByteInteger(&type, &map[0], headerSize, &position) < 0)
{
- DALI_LOG_ERROR("Error: unable to read type!");
+ DALI_LOG_ERROR("Error: unable to read type!\n");
return false;
}
position++; /* skipping one byte */
DALI_LOG_ERROR("Error: unknown format!\n");
return false;
}
- if (extractMultiByteInteger(&w, &map[0], fsize, &position) < 0)
+ if (extractMultiByteInteger(&w, &map[0], headerSize, &position) < 0)
{
DALI_LOG_ERROR("Error: can not read width!\n");
return false;
}
- if (extractMultiByteInteger(&h, &map[0], fsize, &position) < 0)
+ if (extractMultiByteInteger(&h, &map[0], headerSize, &position) < 0)
{
DALI_LOG_ERROR("Error: can not read height!\n");
return false;