Hello community, here is the log from the commit of package python-imaging checked in at Sat Oct 21 21:36:54 CEST 2006. -------- --- python-imaging/python-imaging.changes 2006-04-20 17:22:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-imaging/python-imaging.changes 2006-10-20 18:47:23.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Oct 20 18:47:10 CEST 2006 - jmatejek@suse.cz + +- fixed minor 64bit PEP353 related problems + +------------------------------------------------------------------- New: ---- Imaging-1.1.5-ssize.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-imaging.spec ++++++ --- /var/tmp/diff_new_pack.Tina5a/_old 2006-10-21 21:36:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Tina5a/_new 2006-10-21 21:36:41.000000000 +0200 @@ -15,8 +15,8 @@ URL: http://www.pythonware.com/products/pil/index.htm %define pyver %(python -c 'import sys; print sys.version[:3]') Version: 1.1.5 -Release: 13 -License: Python, X11/MIT +Release: 29 +License: Other License(s), see package, Python Copyright Group: Development/Libraries/Python Provides: _imaging.so _imagingtk.so python_imaging_lib pyimglib Requires: python >= %pyver, python < %{pyver}.99 @@ -29,6 +29,7 @@ Patch0: Imaging-1.1.5-realloc.patch Patch1: Imaging-1.1.5-test.patch Patch2: Imaging-1.1.5-64bit.patch +Patch3: Imaging-1.1.5-ssize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -65,6 +66,7 @@ %patch0 %patch1 %patch2 +%patch3 cp %{S:1} . %build @@ -111,6 +113,8 @@ %doc Sane/sanedoc.txt Sane/README Sane/CHANGES %changelog -n python-imaging +* Fri Oct 20 2006 - jmatejek@suse.cz +- fixed minor 64bit PEP353 related problems * Thu Apr 20 2006 - jmatejek@suse.cz - fixed dependency resolving on 64bit platforms * Thu Apr 20 2006 - jmatejek@suse.cz @@ -125,7 +129,7 @@ - fixed bad use of realloc() * Fri Oct 07 2005 - matejcik@suse.cz - updated to 1.1.5 -- further cleanup of build process + - further cleanup of build process - removed ImConfig.h, as it is no longer provided - cleaned up specfile * Fri Apr 16 2004 - mcihar@suse.cz @@ -182,9 +186,9 @@ - replaced old Tkinter to compile with python 2.2 * Tue Aug 28 2001 - rvasice@suse.cz - update to version 1.1.2 -- adapted for python 2.1 - regex module -> re -- fixed broken "show" method, TIFF "save" bug -- added transparency support to the PNG codec + - adapted for python 2.1 - regex module -> re + - fixed broken "show" method, TIFF "save" bug + - added transparency support to the PNG codec * Wed Dec 06 2000 - mt@suse.de - cleaned up tk dependencies * Thu Nov 30 2000 - ro@suse.de ++++++ Imaging-1.1.5-ssize.patch ++++++ --- _imaging.c +++ _imaging.c @@ -297,6 +297,7 @@ getlist(PyObject* arg, int* length, const char* wrong_length, int type) { int i, n; + Py_ssize_t s; void* list; if (!PySequence_Check(arg)) { @@ -304,7 +305,8 @@ return NULL; } - n = PyObject_Length(arg); + s = PyObject_Length(arg); + n = (s > INT_MAX) ? INT_MAX : s; if (length && wrong_length && n != *length) { PyErr_SetString(PyExc_ValueError, wrong_length); return NULL; @@ -1082,6 +1084,7 @@ { Imaging image; int n, i, x, y; + Py_ssize_t s; PyObject* data; double scale = 1.0; @@ -1096,7 +1099,8 @@ image = self->image; - n = PyObject_Length(data); + s = PyObject_Length(data); + n = (s > INT_MAX) ? INT_MAX : s; if (n > (int) (image->xsize * image->ysize)) { PyErr_SetString(PyExc_TypeError, "too many data entries"); return NULL; @@ -2762,13 +2766,13 @@ } static PySequenceMethods image_as_sequence = { - (inquiry)image_length, /*sq_length*/ + (lenfunc)image_length, /*sq_length*/ (binaryfunc)0, /*sq_concat*/ - (intargfunc)0, /*sq_repeat*/ - (intargfunc)image_item, /*sq_item*/ - (intintargfunc)0, /*sq_slice*/ - (intobjargproc)0, /*sq_ass_item*/ - (intintobjargproc)0, /*sq_ass_slice*/ + (ssizeargfunc)0, /*sq_repeat*/ + (ssizeargfunc)image_item, /*sq_item*/ + (ssizessizeargfunc)0, /*sq_slice*/ + (ssizeobjargproc)0, /*sq_ass_item*/ + (ssizessizeobjargproc)0, /*sq_ass_slice*/ }; --- path.c +++ path.c @@ -91,7 +91,8 @@ int PyPath_Flatten(PyObject* data, double **pxy) { - int i, j, n; + int j; + Py_ssize_t i,n; double *xy; if (PyPath_Check(data)) { @@ -532,13 +533,13 @@ } static PySequenceMethods path_as_sequence = { - (inquiry)path_len, /*sq_length*/ + (lenfunc)path_len, /*sq_length*/ (binaryfunc)0, /*sq_concat*/ - (intargfunc)0, /*sq_repeat*/ - (intargfunc)path_getitem, /*sq_item*/ - (intintargfunc)path_getslice, /*sq_slice*/ - (intobjargproc)path_setitem, /*sq_ass_item*/ - (intintobjargproc)0, /*sq_ass_slice*/ + (ssizeargfunc)0, /*sq_repeat*/ + (ssizeargfunc)path_getitem, /*sq_item*/ + (ssizessizeargfunc)path_getslice, /*sq_slice*/ + (ssizeobjargproc)path_setitem, /*sq_ass_item*/ + (ssizessizeobjargproc)0, /*sq_ass_slice*/ }; statichere PyTypeObject PyPathType = { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org