{
case EXIF_FORMAT_ASCII:
{
- out.Insert( shortName, std::string(reinterpret_cast<char *>(entry.data)) );
+ out.Insert( shortName, std::string( reinterpret_cast<char *>(entry.data), entry.size ) );
break;
}
case EXIF_FORMAT_SHORT:
{
- out.Insert( shortName, ConvertExifNumeric<int, unsigned int>(entry) );
+ out.Insert( shortName, ConvertExifNumeric<int, unsigned short>(entry) );
break;
}
case EXIF_FORMAT_LONG:
}
case EXIF_FORMAT_SSHORT:
{
- out.Insert( shortName, ConvertExifNumeric<int, int>(entry) );
+ out.Insert( shortName, ConvertExifNumeric<int, short>(entry) );
break;
}
case EXIF_FORMAT_SLONG:
return true;
}
-bool LoadBitmapFromJpeg( const ImageLoader::Input& input, Dali::Devel::PixelBuffer& bitmap )
+bool LoadBitmapFromJpeg( const Dali::ImageLoader::Input& input, Dali::Devel::PixelBuffer& bitmap )
{
const int flags= 0;
FILE* const fp = input.file;
// Initialise a JPEG codec:
{
auto jpeg = MakeJpegCompressor();
- if( jpeg )
+ if( !jpeg )
{
DALI_LOG_ERROR( "JPEG Compressor init failed: %s\n", tjGetErrorStr() );
return false;
return exifData;
}
-bool LoadJpegHeader( const ImageLoader::Input& input, unsigned int& width, unsigned int& height )
+bool LoadJpegHeader( const Dali::ImageLoader::Input& input, unsigned int& width, unsigned int& height )
{
unsigned int requiredWidth = input.scalingParameters.dimensions.GetWidth();
unsigned int requiredHeight = input.scalingParameters.dimensions.GetHeight();