This patch allows us to build libextractor against exiv2 0.27.x. Adapted from this upstream commit: commit 1ecee9a47717e36cb8a3925d011d1a6de11d631c Author: Christian Grothoff Date: Mon Jul 29 17:58:18 2019 +0200 importing patch from Gentoo/AS to address exiv2 build issue (#5820) diff --git a/src/plugins/exiv2_extractor.cc b/src/plugins/exiv2_extractor.cc index 8741d40..ef402a8 100644 --- a/src/plugins/exiv2_extractor.cc +++ b/src/plugins/exiv2_extractor.cc @@ -27,10 +27,7 @@ #include #include #include -#include -#include -#include -#include +#include /** * Enable debugging to get error messages. @@ -180,7 +177,7 @@ public: * * @return -1 on error */ -#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) +#if EXIV2_TEST_VERSION(0,26,0) virtual size_t size (void) const; #else virtual long int size (void) const; @@ -316,7 +313,11 @@ Extracto
aboutsummaryrefslogtreecommitdiff
blob: 12d8934e430fde7ecb23721b59cbc0b97bbf75ec (about) (plain)
blob size (102KB) exceeds display size limit (100KB).
EXIV2_VERSION +#if !EXIV2_TEST_VERSION(0,24,0) Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute); #endif std::auto_ptr eio(new ExtractorIO (ec));