[gexiv2] Require exiv2 >= 0.26



commit d585c7a836dcc7e97daee65f130fbe82f35bb2bc
Author: Jens Georg <mail jensge org>
Date:   Sun Dec 24 15:34:44 2017 +0100

    Require exiv2 >= 0.26

 gexiv2/gexiv2-stream-io.cpp | 2 +-
 gexiv2/gexiv2-stream-io.h   | 8 +-------
 meson.build                 | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/gexiv2/gexiv2-stream-io.cpp b/gexiv2/gexiv2-stream-io.cpp
index abfb843..b772b74 100644
--- a/gexiv2/gexiv2-stream-io.cpp
+++ b/gexiv2/gexiv2-stream-io.cpp
@@ -142,7 +142,7 @@ long StreamIo::tell () const {
     return cb->Position (cb->handle);
 }
 
-StreamIo::size_type StreamIo::size () const {
+size_t StreamIo::size () const {
     return cb->Length (cb->handle);
 }
 
diff --git a/gexiv2/gexiv2-stream-io.h b/gexiv2/gexiv2-stream-io.h
index 7190360..430ac01 100644
--- a/gexiv2/gexiv2-stream-io.h
+++ b/gexiv2/gexiv2-stream-io.h
@@ -25,12 +25,6 @@ public:
 
        StreamIo (ManagedStreamCallbacks* cb);
 
-#if EXIV2_MAJOR_VERSION >= 1 || (EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION >= 26)
-    typedef size_t size_type;
-#else
-    typedef long size_type;
-#endif
-
        virtual ~StreamIo ();
        virtual int open ();
        virtual int close ();
@@ -45,7 +39,7 @@ public:
        virtual Exiv2::byte* mmap (bool isWriteable = false);
        virtual int munmap ();
        virtual long tell () const;
-       virtual size_type size () const;
+       virtual size_t size () const;
        virtual bool isopen () const;
        virtual int error () const;
        virtual bool eof () const;
diff --git a/meson.build b/meson.build
index 52a4af0..953601e 100644
--- a/meson.build
+++ b/meson.build
@@ -2,7 +2,7 @@ project('gexiv2', ['c', 'cpp'], version : '0.11.0')
 gnome = import('gnome')
 pkg = import('pkgconfig')
 
-exiv2 = dependency('exiv2', version : '>= 0.21')
+exiv2 = dependency('exiv2', version : '>= 0.26')
 gobject = dependency('gobject-2.0', version : '>= 2.38.0')
 
 gir = find_program('g-ir-scanner', required: false)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]