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

only rebuild heif exif if we have to

Browse Source 
and fix write of XMP write in heic
This commit is contained in:
John Cupitt 2020-07-19 02:06:36 +01:00
parent fcaba0e6ba
commit 72ca38cab0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libvips/foreign/heifsave.c
View File

@ -147,10 +147,15 @@ static int
vips_foreign_save_heif_write_metadata( VipsForeignSaveHeif *heif ) vips_foreign_save_heif_write_metadata( VipsForeignSaveHeif *heif )
{ {
#ifdef HAVE_HEIF_CONTEXT_ADD_EXIF_METADATA #ifdef HAVE_HEIF_CONTEXT_ADD_EXIF_METADATA
int i; int i;
struct heif_error error; struct heif_error error;
/* Rebuild exif from tags, if we'll be saving it.
*/
if( vips_image_get_typeof( heif->image, VIPS_META_EXIF_NAME ) )
if( vips__exif_update( heif->image ) )
return( -1 );
for( i = 0; i < VIPS_NUMBER( libheif_metadata ); i++ ) for( i = 0; i < VIPS_NUMBER( libheif_metadata ); i++ )
if( vips_image_get_typeof( heif->image, if( vips_image_get_typeof( heif->image,
libheif_metadata[i].name ) ) { libheif_metadata[i].name ) ) {
@ -163,7 +168,7 @@ vips_foreign_save_heif_write_metadata( VipsForeignSaveHeif *heif )
#endif /*DEBUG*/ #endif /*DEBUG*/
if( vips_image_get_blob( heif->image, if( vips_image_get_blob( heif->image,
VIPS_META_EXIF_NAME, &data, &length ) ) libheif_metadata[i].name, &data, &length ) )
return( -1 ); return( -1 );
error = libheif_metadata[i].saver( heif->ctx, error = libheif_metadata[i].saver( heif->ctx,
@ -327,14 +332,11 @@ vips_foreign_save_heif_build( VipsObject *object )
build( object ) ) build( object ) )
return( -1 ); return( -1 );
/* Only rebuild exif if there's an EXIF block or we'll make a /* Make a copy of the image in case we modify the metadata eg. for
* default set of tags. EXIF is not required for heif. * exif_update.
*/ */
if( vips_copy( save->ready, &heif->image, NULL ) ) if( vips_copy( save->ready, &heif->image, NULL ) )
return( -1 ); return( -1 );
if( vips_image_get_typeof( heif->image, VIPS_META_EXIF_NAME ) )
if( vips__exif_update( heif->image ) )
return( -1 );
error = heif_context_get_encoder_for_format( heif->ctx, error = heif_context_get_encoder_for_format( heif->ctx,
(enum heif_compression_format) heif->compression, (enum heif_compression_format) heif->compression,