Compare commits

..

2 Commits

2 changed files with 28 additions and 19 deletions

View File

@@ -12,6 +12,8 @@
#include <time.h> #include <time.h>
#if defined(__linux__) || defined(__APPLE__) #if defined(__linux__) || defined(__APPLE__)
#include <iconv.h> #include <iconv.h>
#elif defined(__WIN32__) || defined(_WIN32)
#define timegm _mkgmtime
#endif #endif
//---------------------------------------------------------------------------// //---------------------------------------------------------------------------//
@@ -494,10 +496,18 @@ 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
std::string cpn = std::string("CP") + codepage_; 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");
@@ -516,7 +526,6 @@ namespace imc
conv.convert(group_name_); conv.convert(group_name_);
conv.convert(group_comment_); conv.convert(group_comment_);
} }
}
// get info string // get info string
std::string get_info(int width = 20) std::string get_info(int width = 20)

View File

@@ -1 +1 @@
2.0.15 2.0.16