blob: c3fd932e2a2139cb74698546d63404339fc95bc7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
From f295c5ce9d0a87ee0c2cc793ca191369e05b7cf1 Mon Sep 17 00:00:00 2001
From: Jens Georg <mail@jensge.org>
Date: Fri, 12 May 2017 19:50:58 +0200
Subject: iostream: Adapt to new Exiv2 API in 0.26
https://bugzilla.gnome.org/show_bug.cgi?id=782449
---
gexiv2/gexiv2-stream-io.cpp | 4 ++--
gexiv2/gexiv2-stream-io.h | 8 +++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/gexiv2/gexiv2-stream-io.cpp b/gexiv2/gexiv2-stream-io.cpp
index 0ae3324..abfb843 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 {
+StreamIo::size_type StreamIo::size () const {
return cb->Length (cb->handle);
}
diff --git a/gexiv2/gexiv2-stream-io.h b/gexiv2/gexiv2-stream-io.h
index 76621a9..a26f4e6 100644
--- a/gexiv2/gexiv2-stream-io.h
+++ b/gexiv2/gexiv2-stream-io.h
@@ -25,6 +25,12 @@ public:
StreamIo (ManagedStreamCallbacks* cb);
+#if EXIV2_TEST_VERSION(0,26,0)
+ typedef size_t size_type;
+#else
+ typedef long size_type;
+#endif
+
virtual ~StreamIo ();
virtual int open ();
virtual int close ();
@@ -39,7 +45,7 @@ public:
virtual Exiv2::byte* mmap (bool isWriteable = false);
virtual int munmap ();
virtual long tell () const;
- virtual long size () const;
+ virtual size_type size () const;
virtual bool isopen () const;
virtual int error () const;
virtual bool eof () const;
--
cgit v0.12
|
GitWeb
