Port to exiv2-0.18

2 files changed, 16 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 38a2ef1..5ce991c 100644
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,13 @@ CFLAGS = -I. -I/usr/include -Wall -fPIC -g \
 
 OBJECTS=gallery-utils.o jpeg-utils.o xml-parser.o setup.o items.o generators.o cgg.o
 
+EXIV2_CFLAGS_EXTRA=`pkg-config --max-version=0.17.1 exiv2 || echo -D_EXIV2_NEW_API`
+
 .SUFFIXES: .c .cpp
 .c.o:
-	$(CC) $(CFLAGS) `pkg-config libxml-2.0 glib-2.0 --cflags` `Wand-config --cflags` -c $<
+	$(CC) $(CFLAGS) `pkg-config libxml-2.0 glib-2.0 --cflags` `Wand-config --cflags` $(EXIV2_CFLAGS_EXTRA) -c $<
 .cpp.o:
-	$(CPP) $(CFLAGS) `pkg-config libxml-2.0 glib-2.0 exiv2 --cflags` `Wand-config --cppflags` -c $<
+	$(CPP) $(CFLAGS) `pkg-config libxml-2.0 glib-2.0 exiv2 --cflags` `Wand-config --cppflags` $(EXIV2_CFLAGS_EXTRA) -c $<
 
 all cgg: check $(OBJECTS)
 	$(CC) -o cgg $(OBJECTS) -lm $(CFLAGS) `pkg-config libxml-2.0 glib-2.0 exiv2 --libs` `Wand-config --ldflags --libs`
diff --git a/jpeg-utils.cpp b/jpeg-utils.cpp
index c884ef4..6ccf491 100644
--- a/jpeg-utils.cpp
+++ b/jpeg-utils.cpp
@@ -400,13 +400,25 @@ modify_exif (const char *filename, gboolean strip_thumbnail, const char *add_cop
        image->iptcData()["Iptc.Application2.Copyright"] = add_copyright;
        was_modified = true;
      }
+
      if (strip_thumbnail && (! exifData.empty()))  {
+#ifdef _EXIV2_NEW_API
+       Exiv2::ExifThumb exifThumb(image->exifData());
+       std::string thumbExt = exifThumb.extension();
+#else
        std::string thumbExt = exifData.thumbnailExtension();
+#endif
+
        if (! thumbExt.empty()) {
+#ifdef _EXIV2_NEW_API
+         exifThumb.erase();
+#else
          exifData.eraseThumbnail();
+#endif
          was_modified = true;
        }
      }
+
      if (was_modified)
        image->writeMetadata();
   }