[gimp/gimp-attributes-wip] libgimpbase: rename constants to gexiv2 constants. GExiv2 does rename the versions in a different ma



commit db980ff0489115b27bbf3f33c932683650d8f210
Author: Hartmut Kuhse <hk_priv gmx de>
Date:   Fri Oct 24 19:28:27 2014 +0200

    libgimpbase: rename constants to gexiv2 constants.
    GExiv2 does rename the versions in a different manner, than gimp does.
    If a new gexiv2 release is made, the version is altered and after that, the release is made.
    So the git master is always the same version as the last release, until the next release is made.
    This Gimp branch does compile with the current gexiv2 git master, but not with the current
    gexiv2 release (0.10.2).
    I expect the next release to be 0.10.3, so configure.ac needs version 0.10.3 of gexiv2.

 app/pdb/internal-procs.c     |    2 +-
 libgimpbase/gimpattributes.c |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/app/pdb/internal-procs.c b/app/pdb/internal-procs.c
index bcc4e4f..83418f1 100644
--- a/app/pdb/internal-procs.c
+++ b/app/pdb/internal-procs.c
@@ -28,7 +28,7 @@
 #include "internal-procs.h"
 
 
-/* 733 procedures registered total */
+/* 735 procedures registered total */
 
 void
 internal_procs_init (GimpPDB *pdb)
diff --git a/libgimpbase/gimpattributes.c b/libgimpbase/gimpattributes.c
index c39f84e..2aa2ee4 100644
--- a/libgimpbase/gimpattributes.c
+++ b/libgimpbase/gimpattributes.c
@@ -1096,7 +1096,7 @@ gimp_attributes_to_metadata (GimpAttributes *attributes,
 
                   if (is_xmp)
                     {
-                      t_packet = gexiv2_metadata_generate_xmp_packet (metadata, USE_COMPACT_FORMAT | 
OMIT_ALL_FORMATTING, 0);
+                      t_packet = gexiv2_metadata_generate_xmp_packet (metadata, GEXIV2_USE_COMPACT_FORMAT | 
GEXIV2_OMIT_ALL_FORMATTING, 0);
 
                       if (! g_strcmp0 (t_packet, o_packet))
                         {
@@ -1381,7 +1381,7 @@ gimp_attributes_to_xmp_packet (GimpAttributes *attributes,
 
                   }
 
-                  t_packet = gexiv2_metadata_generate_xmp_packet (metadata, USE_COMPACT_FORMAT | 
OMIT_ALL_FORMATTING, 0);
+                  t_packet = gexiv2_metadata_generate_xmp_packet (metadata, GEXIV2_USE_COMPACT_FORMAT | 
GEXIV2_OMIT_ALL_FORMATTING, 0);
 
                   if (! t_packet || ! g_strcmp0 (t_packet, o_packet))
                     {
@@ -1413,7 +1413,7 @@ gimp_attributes_to_xmp_packet (GimpAttributes *attributes,
   if (xmp_structure_list)
     g_slist_free (xmp_structure_list);
 
-  packet_string = gexiv2_metadata_generate_xmp_packet (metadata, USE_COMPACT_FORMAT | WRITE_ALIAS_COMMENTS, 
0);
+  packet_string = gexiv2_metadata_generate_xmp_packet (metadata, GEXIV2_USE_COMPACT_FORMAT | 
GEXIV2_WRITE_ALIAS_COMMENTS, 0);
   return packet_string;
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]