Compare commits

...

2 Commits

3 changed files with 15 additions and 16 deletions

View File

@@ -40,12 +40,6 @@ jobs:
with:
name: wheel-config
path: python/
- name: Install libiconv for windows
if: matrix.os == 'windows-2019'
run: |
git clone https://github.com/Microsoft/vcpkg.git
.\vcpkg\bootstrap-vcpkg.bat
vcpkg install libiconv
- name: Build wheels
run: python -m cibuildwheel --output-dir wheelhouse
working-directory: python/

View File

@@ -12,6 +12,8 @@
#include <time.h>
#if defined(__linux__) || defined(__APPLE__)
#include <iconv.h>
#elif defined(__WIN32__) || defined(_WIN32)
#define timegm _mkgmtime
#endif
//---------------------------------------------------------------------------//
@@ -146,21 +148,19 @@ namespace imc
return sumstr;
}
#if defined(__linux__) || defined(__APPLE__)
// convert encoding of any descriptions, channel-names, units etc.
class iconverter
{
#if defined(__linux__) || defined(__APPLE__)
iconv_t cd_;
#endif
std::string in_enc_, out_enc_;
size_t out_buffer_size_;
std::string in_enc_, out_enc_;
iconv_t cd_;
size_t out_buffer_size_;
public:
iconverter(std::string in_enc, std::string out_enc, size_t out_buffer_size = 1024) :
in_enc_(in_enc), out_enc_(out_enc), out_buffer_size_(out_buffer_size)
{
#if defined(__linux__) || defined(__APPLE__)
// allocate descriptor for character set conversion
// (https://man7.org/linux/man-pages/man3/iconv_open.3.html)
cd_ = iconv_open(out_enc.c_str(), in_enc.c_str());
@@ -174,12 +174,10 @@ namespace imc
throw std::runtime_error(errmsg);
}
}
#endif
}
void convert(std::string &astring)
{
#if defined(__linux__) || defined(__APPLE__)
if ( astring.empty() ) return;
std::vector<char> in_buffer(astring.begin(),astring.end());
@@ -221,8 +219,15 @@ namespace imc
std::string outstring(out_buffer.begin(),out_buffer.end()-outbytes);
astring = outstring;
}
#endif
};
#elif defined(__WIN32__) || defined(_WIN32)
class iconverter
{
public:
iconverter(std::string in_enc, std::string out_enc, size_t out_buffer_size = 1024) {}
void convert(std::string &astring) {}
};
#endif
// channel
struct channel

View File

@@ -1 +1 @@
2.0.14
2.0.16