archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity

+ fixed UnicodeString to Py_Unicode conversion (needs testing)

Browse Source
This commit is contained in:
Artem Pavlenko 2009-07-13 21:39:39 +00:00
parent 86b9d0d8bc
commit 9872a3be7c
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bindings/python/mapnik_feature.cpp
View File

@ -48,16 +48,30 @@ namespace boost { namespace python {
PyObject * operator() (UnicodeString const& s) const
{
int32_t len = s.length();
boost::scoped_array<wchar_t> buf(new wchar_t[len]);
UErrorCode err = U_ZERO_ERROR;
u_strToWCS(buf.get(),len,0,s.getBuffer(),len,&err);
PyObject *obj = Py_None;
if (U_SUCCESS(err))
{
obj = ::PyUnicode_FromWideChar(buf.get(),implicit_cast<ssize_t>(len));
}
return obj;
const int32_t BUF_SIZE = 2;
wchar_t buf[BUF_SIZE];
int32_t len = s.length();
int32_t dest_len=0;
UErrorCode err = U_ZERO_ERROR;
u_strToWCS(buf,BUF_SIZE,&dest_len,s.getBuffer(),len,&err);
PyObject *obj = Py_None;
if (err == U_BUFFER_OVERFLOW_ERROR || err == U_STRING_NOT_TERMINATED_WARNING)
{
err = U_ZERO_ERROR;
boost::scoped_array<wchar_t> buf_ptr(new wchar_t [dest_len+1]);
u_strToWCS(buf_ptr.get(),dest_len+1,0,s.getBuffer(),len,&err);
if (U_SUCCESS(err))
{
obj = ::PyUnicode_FromWideChar(buf_ptr.get(),implicit_cast<ssize_t>(dest_len));
}
}
else if (U_SUCCESS(err))
{
obj = ::PyUnicode_FromWideChar(buf,implicit_cast<ssize_t>(dest_len));
}
return obj;
}
PyObject * operator() (mapnik::value_null const& s) const