gimp r25802 - in branches/gimp-2-4: . plug-ins/jpeg

[neo svn gnome org]

Author: neo
Date: Mon May 26 13:17:46 2008
New Revision: 25802
URL: http://svn.gnome.org/viewvc/gimp?rev=25802&view=rev

Log:
2008-05-26  Sven Neumann  <sven gimp org>

	Merged from trunk:

	* plug-ins/jpeg/jpeg-save.c (save_image): fixed logic that decides
	if an EXIF block should be written (bug #529469).


Modified:
   branches/gimp-2-4/ChangeLog
   branches/gimp-2-4/plug-ins/jpeg/jpeg-save.c

Modified: branches/gimp-2-4/plug-ins/jpeg/jpeg-save.c
==============================================================================
--- branches/gimp-2-4/plug-ins/jpeg/jpeg-save.c	(original)
+++ branches/gimp-2-4/plug-ins/jpeg/jpeg-save.c	Mon May 26 13:17:46 2008
@@ -268,11 +268,6 @@
   gboolean  has_alpha;
   gint      rowstride, yend;
   gint      i, j;
-#ifdef HAVE_EXIF
-  guchar   *thumbnail_buffer        = NULL;
-  gint      thumbnail_buffer_length = 0;
-  ExifData *exif_data_tmp           = NULL;
-#endif
 
   drawable = gimp_drawable_get (drawable_ID);
   drawable_type = gimp_drawable_type (drawable_ID);
@@ -503,11 +498,14 @@
 #ifdef HAVE_EXIF
 
   /* Create the thumbnail JPEG in a buffer */
-  if (jsvals.save_exif || jsvals.save_thumbnail)
+  if ((jsvals.save_exif && exif_data) || jsvals.save_thumbnail)
     {
-      guchar *exif_buf = NULL;
-      guint   exif_buf_len;
-      gdouble quality  = MIN (75.0, jsvals.quality);
+      ExifData *exif_data_tmp           = NULL;
+      guchar   *exif_buf                = NULL;
+      guchar   *thumbnail_buffer        = NULL;
+      gint      thumbnail_buffer_length = 0;
+      guint     exif_buf_len;
+      gdouble   quality                 = MIN (75.0, jsvals.quality);
 
       if ( (! jsvals.save_exif) || (! exif_data))
         exif_data_tmp = exif_data_new ();