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

Revert "Restored 0.27.2 "toString()" behaviour of Exifdatum.value().toString() for CommentValue."

Browse Source 
This reverts commit ecae9dc6eb.
This commit is contained in:
Robin Mills 2020-12-14 20:15:42 +00:00
parent 2866415322
commit c6167258ce
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/exif.cpp
View File

@ -226,16 +226,8 @@ namespace Exiv2 {
if ( ti ) {
fct = ti->printFct_;
if ( ti->typeId_ == comment ) {
fct=NULL;
const Exiv2::CommentValue* cv = dynamic_cast<const Exiv2::CommentValue*>(&value());
Exiv2::CommentValue::CharsetId csId = cv->charsetId();
if ( csId != CommentValue::undefined ) {
os << "charset=" << CommentValue::CharsetInfo::name(csId) << " ";
}
os << cv->comment();
#if 0
os << "|| value().toString() = " << value().toString();
#endif
os << value().toString();
fct=NULL;
}
}
if ( fct ) fct(os, value(), pMetadata);

4
src/value.cpp
View File

@ -548,6 +548,10 @@ namespace Exiv2 {
std::ostream& CommentValue::write(std::ostream& os) const
{
CharsetId csId = charsetId();
if (csId != undefined) {
os << "charset=" << CharsetInfo::name(csId) << " ";
}
return os << comment();
}