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

Some minor tweaks to ensure correctness

Browse Source 
Also fix compilation of the subsequence matcher on OS X
This commit is contained in:
Kovid Goyal 2014-03-07 09:56:07 +05:30
parent 90868e0262
commit 0dc884efc5
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/calibre/gui2/tweak_book/matcher.c
View File

@ -7,6 +7,7 @@
#define NO_ICU_TO_PYTHON #define NO_ICU_TO_PYTHON
#include "icu_calibre_utils.h" #include "icu_calibre_utils.h"
#include <float.h>
#ifdef _MSC_VER #ifdef _MSC_VER
// inline does not work with the visual studio C compiler // inline does not work with the visual studio C compiler

2
src/calibre/utils/icu.py
View File

@ -512,7 +512,7 @@ pêché'''
# }}} # }}}
def test_roundtrip(): def test_roundtrip():
r = u'xxx\0\u2219\U0001f431xxx' for r in (u'xxx\0\u2219\U0001f431xxx', u'\0', u'', u'simple'):
rp = _icu.roundtrip(r) rp = _icu.roundtrip(r)
if rp != r: if rp != r:
raise ValueError(u'Roundtripping failed: %r != %r' % (r, rp)) raise ValueError(u'Roundtripping failed: %r != %r' % (r, rp))

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

@ -28,7 +28,9 @@
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) {
UChar *ans = NULL; UChar *ans = NULL;
Py_ssize_t sz = 0; Py_ssize_t sz = 0;
#ifdef Py_UNICODE_WIDE
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
#endif
if (do_check && !PyUnicode_CheckExact(obj)) { if (do_check && !PyUnicode_CheckExact(obj)) {
PyErr_SetString(PyExc_TypeError, "Not a unicode string"); PyErr_SetString(PyExc_TypeError, "Not a unicode string");
@ -38,14 +40,14 @@ static UChar* python_to_icu(PyObject *obj, int32_t *osz, uint8_t do_check) {
#ifdef Py_UNICODE_WIDE #ifdef Py_UNICODE_WIDE
// wide build (UCS 4) // wide build (UCS 4)
sz = PyUnicode_GET_SIZE(obj); sz = PyUnicode_GET_SIZE(obj);
ans = (UChar*) calloc(2*sz+1, sizeof(UChar)); // There can be no more than 2 UChars per character ans = (UChar*) calloc(2*(sz+1), sizeof(UChar)); // There can be no more than 2 UChars per character + ensure null termination
if (ans == NULL) { PyErr_NoMemory(); goto end; } if (ans == NULL) { PyErr_NoMemory(); goto end; }
u_strFromUTF32(ans, (int32_t)2*sz+1, osz, (UChar32*)PyUnicode_AS_UNICODE(obj), (int32_t)sz, &status); u_strFromUTF32(ans, (int32_t)(2*(sz+1)), osz, (UChar32*)PyUnicode_AS_UNICODE(obj), (int32_t)sz, &status);
if (U_FAILURE(status)) { PyErr_SetString(PyExc_ValueError, u_errorName(status)); free(ans); ans = NULL; goto end; } if (U_FAILURE(status)) { PyErr_SetString(PyExc_ValueError, u_errorName(status)); free(ans); ans = NULL; goto end; }
#else #else
// narrow build (UTF-16) // narrow build (UTF-16)
sz = PyUnicode_GET_DATA_SIZE(obj); sz = PyUnicode_GET_DATA_SIZE(obj);
ans = (UChar*) calloc(sz, 1); ans = (UChar*) calloc(sz+2, 1); // Ensure null termination
if (ans == NULL) { PyErr_NoMemory(); goto end; } if (ans == NULL) { PyErr_NoMemory(); goto end; }
memcpy(ans, PyUnicode_AS_UNICODE(obj), sz); memcpy(ans, PyUnicode_AS_UNICODE(obj), sz);
if (osz != NULL) *osz = (int32_t)PyUnicode_GET_SIZE(obj); if (osz != NULL) *osz = (int32_t)PyUnicode_GET_SIZE(obj);