python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-10 16:22:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Py3 same test results as py2

Browse Source
This commit is contained in:
wiredfool 2013-10-02 20:26:34 -07:00
parent 1a6ca03ec7
commit c5216d79c2
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
_imagingcms.c
View File

@ -518,10 +518,10 @@ _profile_getattr(CmsProfileObject* self, cmsInfoType field)
buf, buf,
256); 256);
if (written) { if (written) {
return PyUnicode_DecodeFSDefault(buf); return PyUnicode_FromString(buf);
} }
// UNDONE suppressing error here by sending back blank string. // UNDONE suppressing error here by sending back blank string.
return PyUnicode_DecodeFSDefault(""); return PyUnicode_FromString("");
} }
static PyObject* static PyObject*
@ -532,17 +532,18 @@ cms_profile_getattr_product_name(CmsProfileObject* self, void* closure)
// was long, Just the model, in 1.x // was long, Just the model, in 1.x
PyObject *model = _profile_getattr(self, cmsInfoModel); PyObject *model = _profile_getattr(self, cmsInfoModel);
PyObject *manufacturer = _profile_getattr(self, cmsInfoManufacturer); PyObject *manufacturer = _profile_getattr(self, cmsInfoManufacturer);
PyObject *result;
if (!PyString_Size(model) && !PyString_Size(manufacturer)){ if (!PyUnicode_GetSize(model) && !PyUnicode_GetSize(manufacturer)){
return _profile_getattr(self, cmsInfoDescription); return _profile_getattr(self, cmsInfoDescription);
} }
if (!PyString_Size(manufacturer) || PyString_Size(model)> 30){ if (!PyUnicode_GetSize(manufacturer) || PyUnicode_GetSize(model)> 30){
return model; return model;
} }
PyString_Concat(&model, result = PyUnicode_Concat(model,
PyString_FromString(" - ")); PyUnicode_FromString(" - "));
PyString_Concat(&model,_profile_getattr(self, cmsInfoManufacturer)); result = PyUnicode_Concat(result,_profile_getattr(self, cmsInfoManufacturer));
return model; return result;
} }
static PyObject* static PyObject*
@ -553,9 +554,9 @@ cms_profile_getattr_product_desc(CmsProfileObject* self, void* closure)
} }
void _info_concat(PyObject **ret, PyObject *elt){ void _info_concat(PyObject **ret, PyObject *elt){
if (PyString_Size(elt)){ if (PyUnicode_GetSize(elt)){
PyString_Concat(ret, elt); *ret = PyUnicode_Concat(*ret, elt);
PyString_Concat(ret, PyString_FromString("\r\n\r\n")); *ret = PyUnicode_Concat(*ret, PyUnicode_FromString("\r\n\r\n"));
} }
} }
@ -565,7 +566,7 @@ cms_profile_getattr_product_info(CmsProfileObject* self, void* closure)
// info was description \r\n\r\n copyright \r\n\r\n K007 tag \r\n\r\n whitepoint // info was description \r\n\r\n copyright \r\n\r\n K007 tag \r\n\r\n whitepoint
PyObject *description = _profile_getattr(self, cmsInfoDescription); PyObject *description = _profile_getattr(self, cmsInfoDescription);
PyObject *copyright = _profile_getattr(self, cmsInfoCopyright); PyObject *copyright = _profile_getattr(self, cmsInfoCopyright);
PyObject *ret = PyString_FromString(""); PyObject *ret = PyUnicode_FromString("");
_info_concat(&ret, description); _info_concat(&ret, description);
_info_concat(&ret, copyright); _info_concat(&ret, copyright);
@ -580,7 +581,7 @@ cms_profile_getattr_product_info(CmsProfileObject* self, void* closure)
if (cmsTempFromWhitePoint(&tempK, &xyyWhitePt)){ if (cmsTempFromWhitePoint(&tempK, &xyyWhitePt)){
char tempstr[10]; char tempstr[10];
snprintf(tempstr, 10, "%5.0f", tempK); snprintf(tempstr, 10, "%5.0f", tempK);
_info_concat(&ret, PyString_FromFormat("White Point: %sK", tempstr)); _info_concat(&ret, PyUnicode_FromFormat("White Point: %sK", tempstr));
} }
} }
return ret; return ret;