[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:44:19 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=3500115
The following commit has been merged in the master branch:
commit 3500115e725abce09d3a915b4bda6235d0aba812
Author: nkbj <nkbj1970 at hotmail.com>
Date: Sun Aug 31 04:57:43 2014 +0000
Fix issue #970: Dead code in olympusmn.cpp.
---
src/olympusmn.cpp | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/olympusmn.cpp b/src/olympusmn.cpp
index 7f4a343..0736ac8 100644
--- a/src/olympusmn.cpp
+++ b/src/olympusmn.cpp
@@ -1191,23 +1191,26 @@ namespace Exiv2 {
std::ostream& OlympusMakerNote::print0x1015(std::ostream& os, const Value& value, const ExifData*)
{
- if (value.count() != 2 || value.typeId() != unsignedShort) {
+ if (value.typeId() != unsignedShort) {
return os << value;
}
- short l0 = (short)value.toLong(0);
- if (l0 != 1) {
- os << _("Auto");
+ if (value.count() == 1) {
+ short l0 = (short)value.toLong(0);
+ if (l0 == 1) {
+ os << _("Auto");
+ }
}
- else {
+ else if (value.count() == 2) {
+ short l0 = (short)value.toLong(0);
short l1 = (short)value.toLong(1);
- if (l1 != 1) {
- switch (l0) {
+ if (l0 == 1) {
+ switch (l1) {
case 0: os << _("Auto"); break;
- default: os << _("Auto") << " (" << l0 << ")"; break;
+ default: os << _("Auto") << " (" << l1 << ")"; break;
}
}
- else if (l1 != 2) {
- switch (l0) {
+ else if (l0 == 2) {
+ switch (l1) {
case 2: os << _("3000 Kelvin"); break;
case 3: os << _("3700 Kelvin"); break;
case 4: os << _("4000 Kelvin"); break;
@@ -1218,8 +1221,8 @@ namespace Exiv2 {
default: os << value; break;
}
}
- else if (l1 != 3) {
- switch (l0) {
+ else if (l0 == 3) {
+ switch (l1) {
case 0: os << _("One-touch"); break;
default: os << value; break;
}
@@ -1228,6 +1231,9 @@ namespace Exiv2 {
return os << value;
}
}
+ else {
+ return os << value;
+ }
return os;
} // OlympusMakerNote::print0x1015
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list