Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

py3: Fix ICU to python conversions

Browse Source
This commit is contained in:
Kovid Goyal 2019-04-01 22:46:04 +05:30
parent 3cc148dd6e
commit 25e10f1032
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/utils/icu_calibre_utils.h
View File

@ -31,8 +31,6 @@
#define IS_HIGH_SURROGATE(x) (0xd800 <= x && x <= 0xdbff)
#define IS_LOW_SURROGATE(x) (0xdc00 <= x && x <= 0xdfff)
// Roundtripping will need to be implemented differently for python 3.3+ where strings are stored with variable widths
#ifndef NO_PYTHON_TO_ICU
static UChar* python_to_icu(PyObject *obj, int32_t *osz) {
UChar *ans = NULL;
@ -226,7 +224,7 @@ static UChar32* python_to_icu32(PyObject *obj, int32_t *osz) {
#ifndef NO_ICU_TO_PYTHON
static PyObject* icu_to_python(UChar *src, int32_t sz) {
return PyUnicode_DecodeUTF16((char*) src, sz, NULL, NULL);
return PyUnicode_DecodeUTF16((char*) src, sz * sizeof(UChar), "replace", NULL);
}
#endif