mario/IMCtermite
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

by default use utf-8 for metadata including non-ascii characters while missing codepage info

Browse Source
This commit is contained in:
Mario Fink 2024-06-12 12:02:26 +02:00
parent 25e114dbea
commit eec3853af9
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/imc_channel.hpp
View File

@ -496,35 +496,28 @@ namespace imc
// convert any description, units etc. to UTF-8 (by default) // convert any description, units etc. to UTF-8 (by default)
void convert_encoding() void convert_encoding()
{ {
// actual input codepage
std::string cpn;
if ( !codepage_.empty() ) if ( !codepage_.empty() )
{ {
// construct iconv-compatible name for respective codepage // construct iconv-compatible name for respective codepage
cpn = std::string("CP") + codepage_; std::string cpn = std::string("CP") + codepage_;
}
else {
// assume codepage 1252 by default
cpn = std::string("CP1252");
}
// set up converter // set up converter
std::string utf = std::string("UTF-8"); std::string utf = std::string("UTF-8");
iconverter conv(cpn,utf); iconverter conv(cpn,utf);
conv.convert(name_); conv.convert(name_);
conv.convert(comment_); conv.convert(comment_);
conv.convert(origin_); conv.convert(origin_);
conv.convert(origin_comment_); conv.convert(origin_comment_);
conv.convert(text_); conv.convert(text_);
conv.convert(language_code_); conv.convert(language_code_);
conv.convert(yname_); conv.convert(yname_);
conv.convert(yunit_); conv.convert(yunit_);
conv.convert(xname_); conv.convert(xname_);
conv.convert(xunit_); conv.convert(xunit_);
conv.convert(group_name_); conv.convert(group_name_);
conv.convert(group_comment_); conv.convert(group_comment_);
}
} }
// get info string // get info string