[gthumb] Merge branch 'wip/kalev/exiv2-0.27' into 'master'

[Paolo Bacchilega <paobac src gnome org>]

commit 9401c1e27f036701cb133384e51a7ae9e910b7c8
Author: Kalev Lember <klember redhat com>
Date:   Thu Jan 31 15:01:02 2019 +0100

    Merge branch 'wip/kalev/exiv2-0.27' into 'master'
    
    Fix the build with exiv2 0.27
    
    Fixes: https://gitlab.gnome.org/GNOME/gthumb/issues/30

 extensions/exiv2_tools/exiv2-utils.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)
---
diff --git a/extensions/exiv2_tools/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp
index 4513771c..aeb927d3 100644
--- a/extensions/exiv2_tools/exiv2-utils.cpp
+++ b/extensions/exiv2_tools/exiv2-utils.cpp
@@ -32,7 +32,12 @@
 #include <sstream>
 #include <vector>
 #include <iomanip>
+#include <exiv2/exiv2.hpp>
+#if EXIV2_TEST_VERSION(0, 27, 0)
+#include <exiv2/xmp_exiv2.hpp>
+#else
 #include <exiv2/xmp.hpp>
+#endif
 #include <gthumb.h>
 #include "exiv2-utils.h"
 
@@ -1071,7 +1076,11 @@ dump_exif_data (Exiv2::ExifData &exifData,
 
        try {
                if (exifData.empty()) {
+#if EXIV2_TEST_VERSION(0, 27, 0)
+                       throw Exiv2::Error(Exiv2::kerErrorMessage, " No Exif data found in the file");
+#else
                        throw Exiv2::Error(1, " No Exif data found in the file");
+#endif
                }
                Exiv2::ExifData::const_iterator end = exifData.end();
                for (Exiv2::ExifData::const_iterator i = exifData.begin(); i != end; ++i) {