|
|
|
@ -157,7 +157,7 @@ TQString KExiv2Priv::convertCommentValue(const Exiv2::Exifdatum &exifDatum)
|
|
|
|
|
}
|
|
|
|
|
else if (charset == "\"Ascii\"")
|
|
|
|
|
{
|
|
|
|
|
return TQString::tqfromLatin1(comment.c_str());
|
|
|
|
|
return TQString::fromLatin1(comment.c_str());
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
@ -215,12 +215,12 @@ TQString KExiv2Priv::detectEncodingAndDecode(const std::string &value)
|
|
|
|
|
// workaround for bug #134999:
|
|
|
|
|
// The TQLatin15Codec may crash if strlen < value.length()
|
|
|
|
|
int length = value.length();
|
|
|
|
|
if (localCodec->name() == TQString::tqfromLatin1("ISO 8859-15"))
|
|
|
|
|
if (localCodec->name() == TQString::fromLatin1("ISO 8859-15"))
|
|
|
|
|
length = strlen(value.c_str());
|
|
|
|
|
return localCodec->toUnicode(value.c_str(), length);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return TQString::tqfromLatin1(value.c_str());
|
|
|
|
|
return TQString::fromLatin1(value.c_str());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // NameSpace KExiv2Iface
|
|
|
|
|