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

imc_channel.hpp: usage of iconv for unix only, bump version 2.0.15

Browse Source
This commit is contained in:
Mario Fink 2023-08-08 23:29:48 +02:00
parent 9a520ddd9c
commit ed5b366341
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/pypi-deploy.yml vendored
View File

@ -40,12 +40,6 @@ jobs:
with: with:
name: wheel-config name: wheel-config
path: python/ 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 - name: Build wheels
run: python -m cibuildwheel --output-dir wheelhouse run: python -m cibuildwheel --output-dir wheelhouse
working-directory: python/ working-directory: python/

17
lib/imc_channel.hpp
View File

@ -146,13 +146,12 @@ namespace imc
return sumstr; return sumstr;
} }
#if defined(__linux__) || defined(__APPLE__)
// convert encoding of any descriptions, channel-names, units etc. // convert encoding of any descriptions, channel-names, units etc.
class iconverter class iconverter
{ {
#if defined(__linux__) || defined(__APPLE__)
iconv_t cd_;
#endif
std::string in_enc_, out_enc_; std::string in_enc_, out_enc_;
iconv_t cd_;
size_t out_buffer_size_; size_t out_buffer_size_;
public: public:
@ -160,7 +159,6 @@ namespace imc
iconverter(std::string in_enc, std::string out_enc, size_t out_buffer_size = 1024) : 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) 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 // allocate descriptor for character set conversion
// (https://man7.org/linux/man-pages/man3/iconv_open.3.html) // (https://man7.org/linux/man-pages/man3/iconv_open.3.html)
cd_ = iconv_open(out_enc.c_str(), in_enc.c_str()); cd_ = iconv_open(out_enc.c_str(), in_enc.c_str());
@ -174,12 +172,10 @@ namespace imc
throw std::runtime_error(errmsg); throw std::runtime_error(errmsg);
} }
} }
#endif
} }
void convert(std::string &astring) void convert(std::string &astring)
{ {
#if defined(__linux__) || defined(__APPLE__)
if ( astring.empty() ) return; if ( astring.empty() ) return;
std::vector<char> in_buffer(astring.begin(),astring.end()); std::vector<char> in_buffer(astring.begin(),astring.end());
@ -221,8 +217,15 @@ namespace imc
std::string outstring(out_buffer.begin(),out_buffer.end()-outbytes); std::string outstring(out_buffer.begin(),out_buffer.end()-outbytes);
astring = outstring; 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 // channel
struct channel struct channel

2
python/VERSION
View File

@ -1 +1 @@
2.0.14 2.0.15