forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
media-gfx/ufraw: Fix build with exiv2-0.27
Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <[email protected]>
- Loading branch information
Showing
2 changed files
with
27 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
--- a/ufraw_exiv2.cc 2015-06-16 05:58:38.000000000 +0200 | ||
+++ b/ufraw_exiv2.cc 2018-12-29 22:51:23.291894430 +0100 | ||
@@ -15,9 +15,7 @@ | ||
#include "ufraw.h" | ||
|
||
#ifdef HAVE_EXIV2 | ||
-#include <exiv2/image.hpp> | ||
-#include <exiv2/easyaccess.hpp> | ||
-#include <exiv2/exif.hpp> | ||
+#include <exiv2/exiv2.hpp> | ||
#include <sstream> | ||
#include <cassert> | ||
|
||
@@ -67,7 +65,11 @@ | ||
if (exifData.empty()) { | ||
std::string error(uf->filename); | ||
error += ": No Exif data found in the file"; | ||
+#if EXIV2_TEST_VERSION(0,27,0) | ||
+ throw Exiv2::Error(Exiv2::kerErrorMessage, error); | ||
+#else | ||
throw Exiv2::Error(1, error); | ||
+#endif | ||
} | ||
|
||
/* List of tag names taken from exiv2's printSummary() in actions.cpp */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters