GNOME.org
 

[gimp] build: Rename HAVE_EXIF define to HAVE_LIBEXIF

commit 2aae54226c1284ebfd325264a045270c019a2c43
Author: Mukund Sivaraman <muks banu com>
Date:   Sun Sep 18 07:04:44 2011 +0530

    build: Rename HAVE_EXIF define to HAVE_LIBEXIF

 configure.ac                           |    2 +-
 plug-ins/file-jpeg/gimpexif.c          |    4 ++--
 plug-ins/file-jpeg/gimpexif.h          |    4 ++--
 plug-ins/file-jpeg/jpeg-exif.c         |    4 ++--
 plug-ins/file-jpeg/jpeg-load.c         |   24 ++++++++++++------------
 plug-ins/file-jpeg/jpeg-load.h         |    4 ++--
 plug-ins/file-jpeg/jpeg-save.c         |   26 +++++++++++++-------------
 plug-ins/file-jpeg/jpeg-settings.c     |    4 ++--
 plug-ins/file-jpeg/jpeg.c              |   22 +++++++++++-----------
 plug-ins/file-jpeg/jpeg.h              |    4 ++--
 plug-ins/file-psd/psd-image-res-load.c |   12 ++++++------
 plug-ins/makefile.msc                  |    2 +-
 12 files changed, 56 insertions(+), 56 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 395ba6d..236ce20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1201,7 +1201,7 @@ have_libexif=no
 if test "x$with_libexif" != xno && test -z "$EXIF_LIBS" && test -n "$JPEG_LIBS"; then
   have_libexif=yes
   PKG_CHECK_MODULES(EXIF, libexif >= exif_required_version,
-    AC_DEFINE(HAVE_EXIF, 1, [Define to 1 if libexif is available]),
+    AC_DEFINE(HAVE_LIBEXIF, 1, [Define to 1 if libexif is available]),
     have_libexif="no (libexif not found or too old)")
 fi
 
diff --git a/plug-ins/file-jpeg/gimpexif.c b/plug-ins/file-jpeg/gimpexif.c
index 136ee2d..007173f 100644
--- a/plug-ins/file-jpeg/gimpexif.c
+++ b/plug-ins/file-jpeg/gimpexif.c
@@ -25,7 +25,7 @@
 
 #include <libgimp/gimp.h>
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 
 #include <libexif/exif-data.h>
 #include <libexif/exif-content.h>
@@ -160,4 +160,4 @@ gimp_exif_data_remove_entry (ExifData *exif_data,
 }
 
 
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
diff --git a/plug-ins/file-jpeg/gimpexif.h b/plug-ins/file-jpeg/gimpexif.h
index 2bcd0ae..9c5a8b8 100644
--- a/plug-ins/file-jpeg/gimpexif.h
+++ b/plug-ins/file-jpeg/gimpexif.h
@@ -19,7 +19,7 @@
  * EXIF-handling code for the metadata library.
  */
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 
 #define EXIF_HEADER_SIZE 8
 
@@ -38,4 +38,4 @@ void          gimp_exif_data_remove_entry (ExifData    *exif_data,
                                            ExifIfd      ifd,
                                            ExifTag      tag);
 
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
diff --git a/plug-ins/file-jpeg/jpeg-exif.c b/plug-ins/file-jpeg/jpeg-exif.c
index a00141d..57e4f61 100644
--- a/plug-ins/file-jpeg/jpeg-exif.c
+++ b/plug-ins/file-jpeg/jpeg-exif.c
@@ -30,7 +30,7 @@
 #include <jpeglib.h>
 #include <jerror.h>
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 
 #include <libexif/exif-content.h>
 #include <libexif/exif-data.h>
@@ -462,4 +462,4 @@ jpeg_exif_rotate_query_dialog (gint32 image_ID)
 }
 
 
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
diff --git a/plug-ins/file-jpeg/jpeg-load.c b/plug-ins/file-jpeg/jpeg-load.c
index 1141edf..c32d484 100644
--- a/plug-ins/file-jpeg/jpeg-load.c
+++ b/plug-ins/file-jpeg/jpeg-load.c
@@ -26,9 +26,9 @@
 #include <jpeglib.h>
 #include <jerror.h>
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 #include <libexif/exif-data.h>
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
 
 #ifdef HAVE_LCMS
 #include <lcms.h>
@@ -51,7 +51,7 @@ static void  jpeg_load_resolution           (gint32    image_ID,
                                              struct jpeg_decompress_struct
                                                        *cinfo);
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 static gboolean  jpeg_load_exif_resolution  (gint32    image_ID,
                                              ExifData *exif_data);
 #endif
@@ -264,7 +264,7 @@ load_image (const gchar  *filename,
       GString  *comment_buffer = NULL;
       guint8   *profile        = NULL;
       guint     profile_size   = 0;
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
       ExifData *exif_data      = NULL;
 #endif
 
@@ -303,7 +303,7 @@ load_image (const gchar  *filename,
               g_print ("jpeg-load: found EXIF block (%d bytes)\n",
                        (gint) (len - sizeof (JPEG_APP_HEADER_EXIF)));
 #endif
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
               if (! exif_data)
                 exif_data = exif_data_new ();
               /* if there are multiple blocks, their data will be merged */
@@ -312,7 +312,7 @@ load_image (const gchar  *filename,
             }
         }
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
       if (!jpeg_load_exif_resolution (image_ID, exif_data))
 #endif
         jpeg_load_resolution (image_ID, &cinfo);
@@ -333,7 +333,7 @@ load_image (const gchar  *filename,
           g_string_free (comment_buffer, TRUE);
         }
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
       /* if we found any EXIF block, then attach the metadata to the image */
       if (exif_data)
         {
@@ -479,7 +479,7 @@ load_image (const gchar  *filename,
 
   gimp_image_insert_layer (image_ID, layer_ID, -1, 0);
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
   jpeg_exif_rotate_query (image_ID, orientation);
 #endif
 
@@ -527,7 +527,7 @@ jpeg_load_resolution (gint32                         image_ID,
     }
 }
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 
 static gboolean
 jpeg_load_exif_resolution (gint32        image_ID,
@@ -572,7 +572,7 @@ jpeg_load_exif_resolution (gint32        image_ID,
   return success;
 }
 
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
 
 /*
  * A number of JPEG files have comments written in a local character set
@@ -599,7 +599,7 @@ jpeg_load_sanitize_comment (gchar *comment)
 }
 
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 
 typedef struct
 {
@@ -952,7 +952,7 @@ load_thumbnail_image (const gchar  *filename,
   return image_ID;
 }
 
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
 
 
 static gpointer
diff --git a/plug-ins/file-jpeg/jpeg-load.h b/plug-ins/file-jpeg/jpeg-load.h
index df2d6cf..b05a100 100644
--- a/plug-ins/file-jpeg/jpeg-load.h
+++ b/plug-ins/file-jpeg/jpeg-load.h
@@ -21,11 +21,11 @@ gint32 load_image           (const gchar  *filename,
                              GError      **error);
 
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 
 gint32 load_thumbnail_image (const gchar  *filename,
                              gint         *width,
                              gint         *height,
                              GError      **error);
 
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-save.c
index 5c18e83..3056497 100644
--- a/plug-ins/file-jpeg/jpeg-save.c
+++ b/plug-ins/file-jpeg/jpeg-save.c
@@ -33,9 +33,9 @@
 #include <jpeglib.h>
 #include <jerror.h>
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 #include <libexif/exif-data.h>
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
@@ -125,14 +125,14 @@ static void  use_orig_qual_changed  (GtkWidget     *toggle,
 static void  use_orig_qual_changed2 (GtkWidget     *toggle,
                                      GtkWidget     *combo);
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 
 static gint  create_thumbnail    (gint32         image_ID,
                                   gint32         drawable_ID,
                                   gdouble        quality,
                                   guchar       **thumbnail_buffer);
 
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
 
 
 static GtkWidget *restart_markers_scale = NULL;
@@ -510,7 +510,7 @@ save_image (const gchar  *filename,
    */
   jpeg_start_compress (&cinfo, TRUE);
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 
   /* Create the thumbnail JPEG in a buffer */
   if ((jsvals.save_exif && exif_data) || jsvals.save_thumbnail)
@@ -584,7 +584,7 @@ save_image (const gchar  *filename,
       if (exif_buf)
         free (exif_buf);
     }
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
 
   /* Step 4.1: Write the comment out - pw */
   if (image_comment && *image_comment)
@@ -998,7 +998,7 @@ save_dialog (void)
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
                                 jsvals.progressive);
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
   pg.save_exif = toggle =
     gtk_check_button_new_with_mnemonic (_("Save _EXIF data"));
   gtk_table_attach (GTK_TABLE (table), toggle, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
@@ -1030,7 +1030,7 @@ save_dialog (void)
 
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
                                 jsvals.save_thumbnail);
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
 
   /* XMP metadata */
   pg.save_xmp = toggle =
@@ -1263,10 +1263,10 @@ load_save_defaults (void)
   jsvals.save_xmp         = DEFAULT_XMP;
   jsvals.use_orig_quality = DEFAULT_USE_ORIG_QUALITY;
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
   if (exif_data && (exif_data->data))
     jsvals.save_thumbnail = TRUE;
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
 
   parasite = gimp_get_parasite (JPEG_DEFAULTS_PARASITE);
 
@@ -1343,7 +1343,7 @@ load_gui_defaults (JpegSaveGui *pg)
   SET_ACTIVE_BTTN (progressive);
   SET_ACTIVE_BTTN (use_orig_quality);
   SET_ACTIVE_BTTN (preview);
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
   SET_ACTIVE_BTTN (save_exif);
   SET_ACTIVE_BTTN (save_thumbnail);
 #endif
@@ -1441,7 +1441,7 @@ use_orig_qual_changed2 (GtkWidget *toggle,
     }
 }
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 
 static guchar *tbuffer = NULL;
 static guchar *tbuffer2 = NULL;
@@ -1658,4 +1658,4 @@ create_thumbnail (gint32    image_ID,
   return tbuffer_count;
 }
 
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
diff --git a/plug-ins/file-jpeg/jpeg-settings.c b/plug-ins/file-jpeg/jpeg-settings.c
index f96fd1f..e4112b9 100644
--- a/plug-ins/file-jpeg/jpeg-settings.c
+++ b/plug-ins/file-jpeg/jpeg-settings.c
@@ -50,9 +50,9 @@
 
 #include <jpeglib.h>
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 #include <libexif/exif-data.h>
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
 
 #include <libgimp/gimp.h>
 
diff --git a/plug-ins/file-jpeg/jpeg.c b/plug-ins/file-jpeg/jpeg.c
index 1840aaf..9a573dd 100644
--- a/plug-ins/file-jpeg/jpeg.c
+++ b/plug-ins/file-jpeg/jpeg.c
@@ -24,9 +24,9 @@
 #include <jpeglib.h>
 #include <jerror.h>
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 #include <libexif/exif-data.h>
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
 
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
@@ -63,7 +63,7 @@ JpegSubsampling  orig_subsmp;
 gint             num_quant_tables;
 
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 ExifData        *exif_data = NULL;
 #endif
 
@@ -93,7 +93,7 @@ query (void)
     { GIMP_PDB_IMAGE,   "image",         "Output image" }
   };
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 
   static const GimpParamDef thumb_args[] =
   {
@@ -107,7 +107,7 @@ query (void)
     { GIMP_PDB_INT32,  "image-height", "Height of full-sized image"    }
   };
 
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
 
   static const GimpParamDef save_args[] =
   {
@@ -146,7 +146,7 @@ query (void)
                                     "",
                                     "6,string,JFIF,6,string,Exif");
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 
   gimp_install_procedure (LOAD_THUMB_PROC,
                           "Loads a thumbnail from a JPEG image",
@@ -163,7 +163,7 @@ query (void)
 
   gimp_register_thumbnail_loader (LOAD_PROC, LOAD_THUMB_PROC);
 
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
 
   gimp_install_procedure (SAVE_PROC,
                           "saves files in the JPEG file format",
@@ -244,7 +244,7 @@ run (const gchar      *name,
 
     }
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 
   else if (strcmp (name, LOAD_THUMB_PROC) == 0)
     {
@@ -277,7 +277,7 @@ run (const gchar      *name,
         }
     }
 
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
 
   else if (strcmp (name, SAVE_PROC) == 0)
     {
@@ -338,13 +338,13 @@ run (const gchar      *name,
           gimp_parasite_free (parasite);
         }
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 
       exif_data = gimp_metadata_generate_exif (orig_image_ID);
       if (exif_data)
         jpeg_setup_exif_for_save (exif_data, orig_image_ID);
 
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
 
       load_save_defaults ();
 
diff --git a/plug-ins/file-jpeg/jpeg.h b/plug-ins/file-jpeg/jpeg.h
index 3919e94..3158b13 100644
--- a/plug-ins/file-jpeg/jpeg.h
+++ b/plug-ins/file-jpeg/jpeg.h
@@ -68,7 +68,7 @@ void      my_emit_message               (j_common_ptr   cinfo,
                                          int            msg_level);
 void      my_output_message             (j_common_ptr   cinfo);
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 
 extern ExifData *exif_data;
 
@@ -90,5 +90,5 @@ void      jpeg_exif_rotate              (gint32         image_ID,
 void      jpeg_exif_rotate_query        (gint32         image_ID,
                                          gint           orientation);
 
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
 
diff --git a/plug-ins/file-psd/psd-image-res-load.c b/plug-ins/file-psd/psd-image-res-load.c
index 60e6a12..5b1b033 100644
--- a/plug-ins/file-psd/psd-image-res-load.c
+++ b/plug-ins/file-psd/psd-image-res-load.c
@@ -94,9 +94,9 @@
 #include <jpeglib.h>
 #include <jerror.h>
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
 #include <libexif/exif-data.h>
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
 #ifdef HAVE_IPTCDATA
 #include <libiptcdata/iptc-data.h>
 #endif /* HAVE_IPTCDATA */
@@ -1207,7 +1207,7 @@ load_resource_1058 (const PSDimageres  *res_a,
 {
   /* Load EXIF data block */
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
   ExifData     *exif_data;
   ExifEntry    *exif_entry;
   guchar       *exif_buf;
@@ -1219,7 +1219,7 @@ load_resource_1058 (const PSDimageres  *res_a,
   gint          nreturn_vals;
 #else
   gchar        *name;
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
 
   GimpParasite *parasite;
   gchar        *res_data;
@@ -1234,7 +1234,7 @@ load_resource_1058 (const PSDimageres  *res_a,
       return -1;
     }
 
-#ifdef HAVE_EXIF
+#ifdef HAVE_LIBEXIF
   /* Add JPEG header & trailer to the TIFF Exif data held in PSD
      resource to allow us to use libexif to serialize the data
      in the same manner as the JPEG load.
@@ -1318,7 +1318,7 @@ load_resource_1058 (const PSDimageres  *res_a,
   gimp_parasite_free (parasite);
   g_free (name);
 
-#endif /* HAVE_EXIF */
+#endif /* HAVE_LIBEXIF */
 
   g_free (res_data);
   return 0;
diff --git a/plug-ins/makefile.msc b/plug-ins/makefile.msc
index 296148d..d535f54 100644
--- a/plug-ins/makefile.msc
+++ b/plug-ins/makefile.msc
@@ -474,7 +474,7 @@ OBJECTS = \
 !IF "$(DIR)"=="file-jpeg"
 EXTRACFLAGS = -I$(JPEG) \
 !IFDEF EXIF
-	$(EXIF_CFLAGS) -DHAVE_EXIF -DHAVE_EXIF_0_6
+	$(EXIF_CFLAGS) -DHAVE_LIBEXIF -DHAVE_EXIF -DHAVE_EXIF_0_6
 !ENDIF
 
 EXTRALIBS = \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]