dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

only check for EXIF_TAG_GPS_VERSION_ID if it's defined (see bug #377917). 

2007-05-06  Sven Neumann  <sven@gimp.org>

	* plug-ins/jpeg/jpeg-exif.c (jpeg_apply_exif_data_to_image): 
only
	check for EXIF_TAG_GPS_VERSION_ID if it's defined (see bug 
#377917).
	This tag was added in libexif 0.6.13.

svn path=/trunk/; revision=22435
This commit is contained in:
Sven Neumann 2007-05-06 14:21:16 +00:00 committed by Sven Neumann
parent 9649912201
commit 24ef133282
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-05-06 Sven Neumann <sven@gimp.org>
* plug-ins/jpeg/jpeg-exif.c (jpeg_apply_exif_data_to_image): only
check for EXIF_TAG_GPS_VERSION_ID if it's defined (see bug #377917).
This tag was added in libexif 0.6.13.
2007-05-06 Sven Neumann <sven@gimp.org>
* configure.in (AM_INIT_AUTOMAKE): pass dist-bzip2 to automake.

12
plug-ins/jpeg/jpeg-exif.c
View File

@ -103,13 +103,17 @@ jpeg_apply_exif_data_to_image (const gchar *filename,
* Unfortunately libexif may return a non-null exif_data even if the file
* contains no exif data. We check for validity by making sure it
* has suitable tags for the EXIF or GPS or Interoperability IFDs.
*/
*
* EXIF_TAG_GPS_VERSION_ID was added in libexif 0.6.13.
*/
if ((! exif_content_get_entry (exif_data->ifd[EXIF_IFD_EXIF],
EXIF_TAG_EXIF_VERSION)) &&
EXIF_TAG_EXIF_VERSION)) &&
#ifdef EXIF_TAG_GPS_VERSION_ID
(! exif_content_get_entry (exif_data->ifd[EXIF_IFD_GPS],
EXIF_TAG_GPS_VERSION_ID)) &&
EXIF_TAG_GPS_VERSION_ID)) &&
#endif
(! exif_content_get_entry (exif_data->ifd[EXIF_IFD_INTEROPERABILITY],
EXIF_TAG_INTEROPERABILITY_VERSION)))
EXIF_TAG_INTEROPERABILITY_VERSION)))
return;
gimp_metadata_store_exif (image_ID, exif_data);