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
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
|
diff --git a/src/Exif/ExifOperations.cpp b/src/Exif/ExifOperations.cpp
index dd3d22a6..4cfe6b70 100644
--- a/src/Exif/ExifOperations.cpp
+++ b/src/Exif/ExifOperations.cpp
@@ -108,7 +108,11 @@ void copyExifData(const std::string &from, const std::string &to,
#endif
try {
+#if EXIV2_TEST_VERSION (0, 28, 0)
+ Exiv2::Image::UniquePtr sourceImage;
+#else
Exiv2::Image::AutoPtr sourceImage;
+#endif
Exiv2::ExifData srcExifData;
if (!from.empty()) {
@@ -128,7 +132,11 @@ void copyExifData(const std::string &from, const std::string &to,
}
// get destination exif data
+#if EXIV2_TEST_VERSION (0, 28, 0)
+ Exiv2::Image::UniquePtr destinationImage = Exiv2::ImageFactory::open(to);
+#else
Exiv2::Image::AutoPtr destinationImage = Exiv2::ImageFactory::open(to);
+#endif
if (dontOverwrite) {
// doesn't throw anything if it is empty
@@ -212,7 +220,11 @@ void copyExifData(const std::string &from, const std::string &to,
destinationImage->setExifData(srcExifData);
}
destinationImage->writeMetadata();
+#if EXIV2_TEST_VERSION (0, 28, 0)
+ } catch (Exiv2::Error &e) {
+#else
} catch (Exiv2::AnyError &e) {
+#endif
#ifndef NDEBUG
qDebug() << e.what();
#endif
@@ -338,7 +350,11 @@ allowed for ev computation purposes.
float getExposureTime(const std::string &filename) {
try {
+#if EXIV2_TEST_VERSION (0, 28, 0)
+ Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
+#else
Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
+#endif
image->readMetadata();
Exiv2::ExifData &exifData = image->exifData();
if (exifData.empty()) return -1;
@@ -374,14 +390,22 @@ float getExposureTime(const std::string &filename) {
} else {
return -1;
}
+#if EXIV2_TEST_VERSION (0, 28, 0)
+ } catch (Exiv2::Error &e) {
+#else
} catch (Exiv2::AnyError &e) {
+#endif
return -1;
}
}
float getAverageLuminance(const std::string &filename) {
try {
+#if EXIV2_TEST_VERSION (0, 28, 0)
+ Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
+#else
Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
+#endif
image->readMetadata();
Exiv2::ExifData &exifData = image->exifData();
@@ -403,7 +427,11 @@ float getAverageLuminance(const std::string &filename) {
<< std::endl;
return -1.0;
+#if EXIV2_TEST_VERSION (0, 28, 0)
+ } catch (Exiv2::Error &e) {
+#else
} catch (Exiv2::AnyError &e) {
+#endif
return -1.0;
}
}
diff --git a/src/Libpfs/exif/exifdata.cpp b/src/Libpfs/exif/exifdata.cpp
index 38472eff..79085e43 100644
--- a/src/Libpfs/exif/exifdata.cpp
+++ b/src/Libpfs/exif/exifdata.cpp
@@ -52,7 +52,11 @@ ExifData::ExifData(const std::string &filename) { fromFile(filename); }
void ExifData::fromFile(const std::string &filename) {
reset();
try {
+#if EXIV2_TEST_VERSION (0, 28, 0)
+ ::Exiv2::Image::UniquePtr image = Exiv2::ImageFactory::open(filename);
+#else
::Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(filename);
+#endif
image->readMetadata();
::Exiv2::ExifData &exifData = image->exifData();
@@ -121,7 +125,11 @@ void ExifData::fromFile(const std::string &filename) {
*/
if ((it = exifData.findKey(Exiv2::ExifKey("Exif.Image.Orientation"))) !=
exifData.end()) {
+#if EXIV2_TEST_VERSION (0, 28, 0)
+ long rotation = it->toUint32();
+#else
long rotation = it->toLong();
+#endif
switch (rotation) {
case 3:
m_orientation = 180;
@@ -134,7 +142,11 @@ void ExifData::fromFile(const std::string &filename) {
break;
}
}
+#if EXIV2_TEST_VERSION (0, 28, 0)
+ } catch (Exiv2::Error &e) {
+#else
} catch (Exiv2::AnyError &e) {
+#endif
return;
}
}
diff --git a/src/TransplantExif/TransplantExifDialog.cpp b/src/TransplantExif/TransplantExifDialog.cpp
index 8364b595..a7683703 100644
--- a/src/TransplantExif/TransplantExifDialog.cpp
+++ b/src/TransplantExif/TransplantExifDialog.cpp
@@ -347,7 +347,11 @@ void TransplantExifDialog::transplant_requested() {
QFile::encodeName((*i_dest)).constData(),
m_Ui->checkBox_dont_overwrite->isChecked());
m_Ui->rightlist->item(index)->setBackground(QBrush("#a0ff87"));
+#if EXIV2_TEST_VERSION (0, 28, 0)
+ } catch (Exiv2::Error &e) {
+#else
} catch (Exiv2::AnyError &e) {
+#endif
add_log_message("ERROR:" + QString::fromStdString(e.what()));
m_Ui->rightlist->item(index)->setBackground(QBrush("#ff743d"));
}
|
GitWeb