sergiotarxz/libvips
sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix up exif parse, add icc profile attach

Browse Source
This commit is contained in:
John Cupitt 2019-01-20 21:08:06 +00:00
parent 5e78ae9b1e
commit e131f173a0
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libvips/foreign/heifload.c
View File

@ -211,7 +211,7 @@ vips_foreign_load_heif_set_header( VipsForeignLoadHeif *heif, VipsImage *out )
const char *type = heif_image_handle_get_metadata_type( const char *type = heif_image_handle_get_metadata_type(
heif->handle, id[i] ); heif->handle, id[i] );
void *data; unsigned char *data;
char name[256]; char name[256];
/* exif has a special name. /* exif has a special name.
@ -223,20 +223,49 @@ vips_foreign_load_heif_set_header( VipsForeignLoadHeif *heif, VipsImage *out )
printf( "metadata type = %s, length = %zd\n", type, length ); printf( "metadata type = %s, length = %zd\n", type, length );
data = g_malloc( length ); if( !(data = VIPS_ARRAY( out, length, unsigned char )) )
return( -1 );
error = heif_image_handle_get_metadata( error = heif_image_handle_get_metadata(
heif->handle, id[i], data ); heif->handle, id[i], data );
if( error.code ) { if( error.code ) {
vips_heif_error( error ); vips_heif_error( error );
g_free( data );
return( -1 ); return( -1 );
} }
/* We need to skip the first four bytes of EXIF, they just
* contain the offset.
*/
if( strcasecmp( type, "exif" ) == 0 ) {
data += 4;
length -= 4;
}
vips_image_set_blob( out, name, vips_image_set_blob( out, name,
(VipsCallbackFn) vips_free, data, length ); (VipsCallbackFn) NULL, data, length );
if( strcasecmp( type, "exif" ) == 0 ) if( strcasecmp( type, "exif" ) == 0 )
vips__exif_parse( out ); (void) vips__exif_parse( out );
}
if( heif_image_handle_get_color_profile_type( heif->handle ) ) {
size_t length = heif_image_handle_get_raw_color_profile_size(
heif->handle );
unsigned char *data;
if( !(data = VIPS_ARRAY( out, length, unsigned char )) )
return( -1 );
error = heif_image_handle_get_raw_color_profile(
heif->handle, data );
if( error.code ) {
vips_heif_error( error );
return( -1 );
}
printf( "profile data, length = %zd\n", length );
vips_image_set_blob( out, VIPS_META_ICC_NAME,
(VipsCallbackFn) NULL, data, length );
} }
return( 0 ); return( 0 );