callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed build for HAVE_EXIF being undefined.

Browse Source 
2007-07-17  Sven Neumann  <sven@gimp.org>

	* plug-ins/jpeg/jpeg-load.c (load_image): fixed build for
	HAVE_EXIF being undefined.


svn path=/trunk/; revision=22951
This commit is contained in:
Sven Neumann
2007-07-17 20:37:26 +00:00
committed by Sven Neumann
parent 58ee85dfa6
commit e9ee1c2ead
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-07-17 Sven Neumann <sven@gimp.org>
* plug-ins/jpeg/jpeg-load.c (load_image): fixed build for
HAVE_EXIF being undefined.
2007-07-17 Sven Neumann <sven@gimp.org> 2007-07-17 Sven Neumann <sven@gimp.org>
* app/base/tile-manager-preview.[ch]: added * app/base/tile-manager-preview.[ch]: added

5
plug-ins/jpeg/jpeg-load.c
View File

@ -318,6 +318,8 @@ load_image (const gchar *filename,
g_string_free (comment_buffer, TRUE); g_string_free (comment_buffer, TRUE);
} }
#ifdef HAVE_EXIF
/* if we found any EXIF block, then attach the metadata to the image */ /* if we found any EXIF block, then attach the metadata to the image */
if (exif_data) if (exif_data)
{ {
@ -326,6 +328,7 @@ load_image (const gchar *filename,
exif_data_unref (exif_data); exif_data_unref (exif_data);
exif_data = NULL; exif_data = NULL;
} }
#endif
/* Step 5.2: check for XMP metadata in APP1 markers (after EXIF) */ /* Step 5.2: check for XMP metadata in APP1 markers (after EXIF) */
for (marker = cinfo.marker_list; marker; marker = marker->next) for (marker = cinfo.marker_list; marker; marker = marker->next)
@ -491,8 +494,10 @@ load_image (const gchar *filename,
gimp_drawable_detach (drawable); gimp_drawable_detach (drawable);
gimp_image_add_layer (image_ID, layer_ID, 0); gimp_image_add_layer (image_ID, layer_ID, 0);
#ifdef HAVE_EXIF
if (orientation > 0) if (orientation > 0)
jpeg_exif_rotate (image_ID, orientation); jpeg_exif_rotate (image_ID, orientation);
#endif
return image_ID; return image_ID;
} }