blob: 33756b2d6dca83011bd24f88d56ec8fef05e1b70 (
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
|
diff --git a/src/core/raster/qgsexiftools.cpp
b/src/core/raster/qgsexiftools.cpp
index 7fa2709845..f883d7960c 100644
--- a/src/core/raster/qgsexiftools.cpp
+++ b/src/core/raster/qgsexiftools.cpp
@@ -182,7 +190,11 @@ QVariant decodeExifData( const QString &key, Exiv2::ExifData::const_iterator &it
case Exiv2::signedLong:
case Exiv2::unsignedLongLong:
case Exiv2::signedLongLong:
+#if EXIV2_TEST_VERSION (0, 28, 0)
+ val = QVariant::fromValue( it->toUint32() );
+#else
val = QVariant::fromValue( it->toLong() );
+#endif
break;
case Exiv2::tiffDouble:
@@ -196,7 +208,11 @@ QVariant decodeExifData( const QString &key, Exiv2::ExifData::const_iterator &it
case Exiv2::signedByte:
case Exiv2::tiffIfd:
case Exiv2::tiffIfd8:
+#if EXIV2_TEST_VERSION (0, 28, 0)
+ val = QVariant::fromValue( static_cast< int >( it->toUint32() ) );
+#else
val = QVariant::fromValue( static_cast< int >( it->toLong() ) );
+#endif
break;
case Exiv2::date:
|