third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Topic: 1801 http://dev.exiv2.org/boards/3/topics/1801. Thanks to Mike Erickson of Alien Skin Software for reporting this and providing the fix.

Browse Source
This commit is contained in:
Robin Mills 2014-08-15 11:14:44 +00:00
parent add5dcfef4
commit 44939dab32
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/olympusmn.cpp
View File

@ -1441,34 +1441,33 @@ namespace Exiv2 {
if (value.count() < 1 || value.typeId() != unsignedShort) {
return os << "(" << value << ")";
}
} else {
uint16_t v = (uint16_t)value.toLong(0);
uint16_t v = (uint16_t)value.toLong(0);
// If value 2 is present, it is used instead of value 1.
if (value.count() > 1) {
std::string p = ""; // Used to enable ',' separation
// If value 2 is present, it is used instead of value 1.
if (value.count() < 2) {
std::string p = ""; // Used to enable ',' separation
v = (uint16_t)value.toLong(1);
for (int i = 0; focusModes1[i].val != 0; i++) {
if ((v & focusModes1[i].val) != 0) {
if (p.size() > 0) {
os << ", ";
}
p = focusModes1[i].label;
os << p;
}
}
} else {
v = (uint16_t)value.toLong(0);
for (int i = 0; focusModes0[i].val != 0xff; i++) {
if (focusModes0[i].val == v) {
os << focusModes0[i].label;
break;
}
}
}
return os << v;
v = (uint16_t)value.toLong(1);
for (int i = 0; focusModes1[i].val != 0; i++) {
if ((v & focusModes1[i].val) != 0) {
if (p.size() > 0) {
os << ", ";
}
p = focusModes1[i].label;
os << p;
}
}
} else {
for (int i = 0; focusModes0[i].val != 0xff; i++) {
if (focusModes0[i].val == v) {
os << focusModes0[i].label;
break;
}
}
}
return os << v;
}
} // OlympusMakerNote::printCs0x0301
//! OlympusCs ArtFilter, tag 0x0529, OlympusCs MagicFilter, tag 0x052c