summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-08-23 09:36:23 +0200
committerChristian Grothoff <christian@grothoff.org>2019-08-23 09:36:23 +0200
commit756ba064345609b739d6e5ef7d9a3bea74637e76 (patch)
treeee3c2f277dbf30b6784a2b4dcf9da754c608f932
parentd2b032452241708bee68d02aa02092cfbfba951a (diff)
parent1ecee9a47717e36cb8a3925d011d1a6de11d631c (diff)
merge
-rw-r--r--AUTHORS1
-rw-r--r--ChangeLog7
-rw-r--r--src/plugins/exiv2_extractor.cc35
3 files changed, 34 insertions, 9 deletions
diff --git a/AUTHORS b/AUTHORS
index 4ef8ad4..fc4c189 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,6 +4,7 @@ LRN <lrn1986@gmail.com>
Developers:
Andreas Huggel <ahuggel@gmx.net>
+Andreas Strumlechner <andreas.sturmlechner@gmail.com>
Blake Matheny <bmatheny@mobocracy.net>
Bruno Cabral <bcabral@uw.edu>
Bruno Haible <bruno@clisp.org>
diff --git a/ChangeLog b/ChangeLog
index 4661050..2f2416d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
Fri 23 Aug 2019 09:34:35 AM CEST
- Fix invalid read for malformed DVI files (#5846). -CG
+ Fix invalid read for malformed DVI files (#5846). -CG
+
+Mon 29 Jul 2019 05:57:04 PM CEST
+ Fix build issue with exiv2-0.27 (#5820). -AS (via Gentoo)
Mon 13 May 2019 07:42:19 AM CEST
- Consistently use AS_IF and AS_CASE in configure.ac. -CG
+ Consistently use AS_IF and AS_CASE in configure.ac. -CG
Sun 12 May 2019 01:56:56 PM CEST
Updated French translation. -CG
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 <cassert>
#include <cstring>
#include <math.h>
-#include <exiv2/exif.hpp>
-#include <exiv2/error.hpp>
-#include <exiv2/image.hpp>
-#include <exiv2/futils.hpp>
+#include <exiv2/exiv2.hpp>
/**
* 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 @@ ExtractorIO::getb ()
const unsigned char *r;
if (1 != ec->read (ec->cls, &data, 1))
+#if EXIV2_TEST_VERSION(0,27,0)
+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
+#else
throw Exiv2::BasicError<char> (42 /* error code */);
+#endif
r = (const unsigned char *) data;
return *r;
}
@@ -371,7 +372,11 @@ ExtractorIO::putb (Exiv2::byte data)
void
ExtractorIO::transfer (Exiv2::BasicIo& src)
{
+#if EXIV2_TEST_VERSION(0,27,0)
+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
+#else
throw Exiv2::BasicError<char> (42 /* error code */);
+#endif
}
@@ -416,7 +421,11 @@ ExtractorIO::seek (long offset,
Exiv2::byte *
ExtractorIO::mmap (bool isWritable)
{
+#if EXIV2_TEST_VERSION(0,27,0)
+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
+#else
throw Exiv2::BasicError<char> (42 /* error code */);
+#endif
}
@@ -449,7 +458,7 @@ ExtractorIO::tell (void) const
*
* @return -1 on error
*/
-#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
+#if EXIV2_TEST_VERSION(0,26,0)
size_t
#else
long int
@@ -504,7 +513,11 @@ ExtractorIO::eof () const
std::string
ExtractorIO::path () const
{
+#if EXIV2_TEST_VERSION(0,27,0)
+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
+#else
throw Exiv2::BasicError<char> (42 /* error code */);
+#endif
}
@@ -517,7 +530,11 @@ ExtractorIO::path () const
std::wstring
ExtractorIO::wpath () const
{
+#if EXIV2_TEST_VERSION(0,27,0)
+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
+#else
throw Exiv2::BasicError<char> (42 /* error code */);
+#endif
}
#endif
@@ -531,7 +548,11 @@ Exiv2::BasicIo::AutoPtr
ExtractorIO::temporary () const
{
fprintf (stderr, "throwing temporary error\n");
+#if EXIV2_TEST_VERSION(0,27,0)
+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed);
+#else
throw Exiv2::BasicError<char> (42 /* error code */);
+#endif
}
@@ -697,7 +718,7 @@ EXTRACTOR_exiv2_extract_method (struct EXTRACTOR_ExtractContext *ec)
{
try
{
-#if EXIV2_MAKE_VERSION(0,23,0) <= EXIV2_VERSION
+#if !EXIV2_TEST_VERSION(0,24,0)
Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute);
#endif
std::auto_ptr<Exiv2::BasicIo> eio(new ExtractorIO (ec));