casa / casa-mp-base / 3aec201398c

Commits

Marcus Calhoun-Lopez authored 3aec201398c 11 May 2019

ufraw: allow build with latest exiv2

No revbump because installed files don't change.

Modified

-1
+--- ufraw_exiv2.cc.orig	2015-06-15 20:58:38.000000000 -0700
-2
++++ ufraw_exiv2.cc	2018-12-22 18:59:36.000000000 -0800
--
+@@ -67,7 +67,7 @@
-+
+@@ -15,9 +15,8 @@
-+
+ #include "ufraw.h"
-+
-+
+ #ifdef HAVE_EXIV2
-+
+-#include <exiv2/image.hpp>
-+
+-#include <exiv2/easyaccess.hpp>
-+
+-#include <exiv2/exif.hpp>
-+
++#include <exiv2/exiv2.hpp>
-+
++#include <iostream>
-+
+ #include <sstream>
-+
+ #include <cassert>
-+
-+
+@@ -67,7 +66,7 @@
-16
+         if (exifData.empty()) {
-17
+             std::string error(uf->filename);
-18
+             error += ": No Exif data found in the file";
-19
+-            throw Exiv2::Error(1, error);
-20
++            throw Exiv2::Error(Exiv2::kerErrorMessage, error);
-21
+         }
-22
-23
+         /* List of tag names taken from exiv2's printSummary() in actions.cpp */