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

fix asfvideo unicode handling

Browse Source 
Use convertStringCharset to convert instead of reimplementing.

Some data is UTF-32 and other is UTF-16. Instead of implementing another
function for Windows, convert from UCS2-LE to UTF-8 twice.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2023-03-27 18:53:44 -07:00
parent 2df5b59c9f
commit b2cd60eeac
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/helper_functions.cpp
View File

@ -5,6 +5,7 @@
#include <cmath>
#include <cstring>
#include <numeric>
#include "convert.hpp"
#include "enforce.hpp"
std::string string_from_unterminated(const char* data, size_t data_length) {
@ -15,21 +16,6 @@ std::string string_from_unterminated(const char* data, size_t data_length) {
return {data, StringLength};
}
namespace {
std::string utf16ToUtf8(const std::u16string& wstr) {
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4244)
auto str = std::string(wstr.begin(), wstr.end());
#pragma warning(pop)
#else
auto str = std::string(wstr.begin(), wstr.end());
#endif
str.erase(std::remove(str.begin(), str.end(), '\0'), str.end());
return str;
}
} // namespace
namespace Exiv2 {
uint64_t readQWORDTag(const BasicIo::UniquePtr& io) {
Internal::enforce(QWORD <= io->size() - io->tell(), Exiv2::ErrorCode::kerCorruptedMetadata);
@ -53,8 +39,11 @@ std::string readStringWcharTag(const BasicIo::UniquePtr& io, size_t length) {
Internal::enforce(length <= io->size() - io->tell(), Exiv2::ErrorCode::kerCorruptedMetadata);
DataBuf FieldBuf(length + 1);
io->readOrThrow(FieldBuf.data(), length, ErrorCode::kerFailedToReadImageData);
std::u16string wst(FieldBuf.begin(), FieldBuf.end());
return utf16ToUtf8(wst);
std::string wst(FieldBuf.begin(), FieldBuf.end() - 3);
if (wst.size() % 2 != 0)
Exiv2::convertStringCharset(wst, "UCS-2LE", "UTF-8");
Exiv2::convertStringCharset(wst, "UCS-2LE", "UTF-8");
return wst;
}
std::string readStringTag(const BasicIo::UniquePtr& io, size_t length) {