Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
effeee105c | |||
ed5b366341 | |||
9a520ddd9c | |||
2c43087d15 |
6
.github/workflows/pypi-deploy.yml
vendored
6
.github/workflows/pypi-deploy.yml
vendored
@@ -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/
|
||||||
|
@@ -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
|
||||||
|
|
||||||
//---------------------------------------------------------------------------//
|
//---------------------------------------------------------------------------//
|
||||||
@@ -146,21 +148,19 @@ 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__)
|
std::string in_enc_, out_enc_;
|
||||||
iconv_t cd_;
|
iconv_t cd_;
|
||||||
#endif
|
size_t out_buffer_size_;
|
||||||
std::string in_enc_, out_enc_;
|
|
||||||
size_t out_buffer_size_;
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
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 +174,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 +219,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
|
||||||
|
@@ -1 +1 @@
|
|||||||
2.0.12
|
2.0.16
|
||||||
|
Reference in New Issue
Block a user