Mercurial > hg > forks > geeqie
changeset 2883:d38b56bd8f22
Fix #654, 655: fix build against exiv2-0.27.x
https://github.com/BestImageViewer/geeqie/pull/655
| author | Rasmus Thomsen <Rasmus.thomsen@protonmail.com> |
|---|---|
| date | Sun, 06 Jan 2019 17:40:31 +0000 |
| parents | 0149f1ddb297 |
| children | f9a21c9891a0 |
| files | src/exiv2.cc |
| diffstat | 1 files changed, 21 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/src/exiv2.cc Sun Jan 06 17:17:20 2019 +0000 +++ b/src/exiv2.cc Sun Jan 06 17:40:31 2019 +0000 @@ -22,17 +22,25 @@ #ifdef HAVE_EXIV2 -#include <exiv2/image.hpp> -#include <exiv2/exif.hpp> +// Don't include the <exiv2/version.hpp> file directly +// Early Exiv2 versions didn't have version.hpp and the macros. +#include <exiv2/exiv2.hpp> #include <iostream> #include <string> // EXIV2_TEST_VERSION is defined in Exiv2 0.15 and newer. +#ifdef EXIV2_VERSION #ifndef EXIV2_TEST_VERSION -# define EXIV2_TEST_VERSION(major,minor,patch) \ +#define EXIV2_TEST_VERSION(major,minor,patch) \ ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) ) #endif +#else +#define EXIV2_TEST_VERSION(major,minor,patch) (false) +#endif +#if EXIV2_TEST_VERSION(0,27,0) +#define HAVE_EXIV2_ERROR_CODE +#endif #include <sys/types.h> #include <sys/stat.h> @@ -40,27 +48,8 @@ #include <fcntl.h> #include <sys/mman.h> -#if !EXIV2_TEST_VERSION(0,17,90) -#include <exiv2/tiffparser.hpp> -#include <exiv2/tiffcomposite.hpp> -#include <exiv2/tiffvisitor.hpp> -#include <exiv2/tiffimage.hpp> -#include <exiv2/cr2image.hpp> -#include <exiv2/crwimage.hpp> -#if EXIV2_TEST_VERSION(0,16,0) -#include <exiv2/orfimage.hpp> -#endif -#if EXIV2_TEST_VERSION(0,13,0) -#include <exiv2/rafimage.hpp> -#endif -#include <exiv2/futils.hpp> -#else -#include <exiv2/preview.hpp> -#endif - -#if EXIV2_TEST_VERSION(0,17,0) -#include <exiv2/convert.hpp> -#include <exiv2/xmpsidecar.hpp> +#if EXIV2_TEST_VERSION(0,27,0) +#define EXV_PACKAGE "exiv2" #endif extern "C" { @@ -374,7 +363,11 @@ #endif Exiv2::Image *image = imageData_->image(); +#ifdef HAVE_EXIV2_ERROR_CODE + if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed); +#else if (!image) throw Exiv2::Error(21); +#endif image->setExifData(exifData_); image->setIptcData(iptcData_); #if EXIV2_TEST_VERSION(0,16,0) @@ -394,8 +387,12 @@ sidecar->setXmpData(xmpData_); sidecar->writeMetadata(); #else +#ifdef HAVE_EXIV2_ERROR_CODE + throw Exiv2::Error(Exiv2::ErrorCode::kerNotAnImage, "xmp"); +#else throw Exiv2::Error(3, "xmp"); #endif +#endif } }