Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use macro instead of sizeof as that is recommended by the python developers

Browse Source
This commit is contained in:
Kovid Goyal 2014-03-06 17:47:48 +05:30
parent 68a37c565d
commit 4b954101b7
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@
#include <unicode/unorm.h> #include <unicode/unorm.h>
#if PY_VERSION_HEX < 0x03030000 #if PY_VERSION_HEX < 0x03030000
// Roundtripping will need to be implemented differently for python > 3.2 where strings are stored with variable widths // Roundtripping will need to be implemented differently for python 3.3+ where strings are stored with variable widths
#ifndef NO_PYTHON_TO_ICU #ifndef NO_PYTHON_TO_ICU
static UChar* python_to_icu(PyObject *obj, int32_t *osz, uint8_t do_check) { static UChar* python_to_icu(PyObject *obj, int32_t *osz, uint8_t do_check) {
@ -35,19 +35,21 @@ static UChar* python_to_icu(PyObject *obj, int32_t *osz, uint8_t do_check) {
goto end; goto end;
} }
if (sizeof(Py_UNICODE) == 2) { // narrow build (UTF-16) #ifdef Py_UNICODE_WIDE
sz = PyUnicode_GET_DATA_SIZE(obj); // wide build (UCS 4)
ans = (UChar*) calloc(sz, 1); sz = PyUnicode_GET_SIZE(obj);
if (ans == NULL) { PyErr_NoMemory(); goto end; } ans = (UChar*) calloc(2*sz+1, sizeof(UChar)); // There can be no more than 2 UChars per character
memcpy(ans, PyUnicode_AS_UNICODE(obj), sz); if (ans == NULL) { PyErr_NoMemory(); goto end; }
if (osz != NULL) *osz = (int32_t)PyUnicode_GET_SIZE(obj); u_strFromUTF32(ans, (int32_t)2*sz+1, osz, (UChar32*)PyUnicode_AS_UNICODE(obj), (int32_t)sz, &status);
} else { // wide build (UCS 4) if (U_FAILURE(status)) { PyErr_SetString(PyExc_ValueError, u_errorName(status)); free(ans); ans = NULL; goto end; }
sz = PyUnicode_GET_SIZE(obj); #else
ans = (UChar*) calloc(2*sz+1, sizeof(UChar)); // There can be no more than 2 UChars per character // narrow build (UTF-16)
if (ans == NULL) { PyErr_NoMemory(); goto end; } sz = PyUnicode_GET_DATA_SIZE(obj);
u_strFromUTF32(ans, (int32_t)2*sz+1, osz, (UChar32*)PyUnicode_AS_UNICODE(obj), (int32_t)sz, &status); ans = (UChar*) calloc(sz, 1);
if (U_FAILURE(status)) { PyErr_SetString(PyExc_ValueError, u_errorName(status)); free(ans); ans = NULL; goto end; } if (ans == NULL) { PyErr_NoMemory(); goto end; }
} memcpy(ans, PyUnicode_AS_UNICODE(obj), sz);
if (osz != NULL) *osz = (int32_t)PyUnicode_GET_SIZE(obj);
#endif
end: end:
return ans; return ans;
} }
@ -55,9 +57,11 @@ end:
#ifndef NO_ICU_TO_PYTHON #ifndef NO_ICU_TO_PYTHON
static PyObject* icu_to_python(UChar *src, int32_t sz) { static PyObject* icu_to_python(UChar *src, int32_t sz) {
if (sizeof(Py_UNICODE) == 2) // narrow build UTF-16 #ifdef Py_UNICODE_WIDE
return PyUnicode_FromUnicode((Py_UNICODE*)src, sz);
return PyUnicode_DecodeUTF16((char*)src, sz*sizeof(UChar), "strict", NULL); return PyUnicode_DecodeUTF16((char*)src, sz*sizeof(UChar), "strict", NULL);
#else
return PyUnicode_FromUnicode((Py_UNICODE*)src, sz);
#endif
} }
#endif #endif