46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
From d0d8ccd051edf0691a6a309143979507fe29c466 Mon Sep 17 00:00:00 2001
|
|
From: Debarshi Ray <debarshir@gnome.org>
|
|
Date: Wed, 10 May 2017 17:22:33 +0200
|
|
Subject: [PATCH] Adapt to Exiv2::BasicIo API change
|
|
|
|
Exiv2::BasicIo::size now returns a size_t instead of long:
|
|
http://dev.exiv2.org/issues/1175
|
|
|
|
Bump minimum Exiv2 version to 0.26.
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=782449
|
|
---
|
|
gexiv2/gexiv2-stream-io.cpp | 2 +-
|
|
gexiv2/gexiv2-stream-io.h | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/gexiv2/gexiv2-stream-io.cpp b/gexiv2/gexiv2-stream-io.cpp
|
|
index 0ae33241f31a..39445013c13b 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);
|
|
}
|
|
|
|
-long 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 76621a9e520b..430ac01c9e3d 100644
|
|
--- a/gexiv2/gexiv2-stream-io.h
|
|
+++ b/gexiv2/gexiv2-stream-io.h
|
|
@@ -39,7 +39,7 @@ public:
|
|
virtual Exiv2::byte* mmap (bool isWriteable = false);
|
|
virtual int munmap ();
|
|
virtual long tell () const;
|
|
- virtual long size () const;
|
|
+ virtual size_t size () const;
|
|
virtual bool isopen () const;
|
|
virtual int error () const;
|
|
virtual bool eof () const;
|
|
--
|
|
2.9.3
|
|
|