Hello community, here is the log from the commit of package python-imaging checked in at Thu Mar 29 22:24:11 CEST 2007. -------- --- python-imaging/python-imaging.changes 2006-10-23 11:22:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-imaging/python-imaging.changes 2007-03-29 20:00:04.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Mar 29 19:58:29 CEST 2007 - matejcik@suse.cz + +- update to 1.1.6 + - threading support for sane module + - NumPy array interface support + - converter to QImage + - new ImageMath module + - bugfixes + +------------------------------------------------------------------- Old: ---- Imaging-1.1.5-realloc.patch Imaging-1.1.5-ssize.patch Imaging-1.1.5.tar.gz New: ---- Imaging-1.1.6-ssize.patch Imaging-1.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-imaging.spec ++++++ --- /var/tmp/diff_new_pack.ml2172/_old 2007-03-29 22:24:07.000000000 +0200 +++ /var/tmp/diff_new_pack.ml2172/_new 2007-03-29 22:24:07.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package python-imaging (Version 1.1.5) +# spec file for package python-imaging (Version 1.1.6) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -14,9 +14,9 @@ BuildRequires: freetype2-devel giflib-devel libgphoto2-devel libpng-devel libtiff-devel netpbm python-devel python-tk sane tix tk-devel xorg-x11-devel URL: http://www.pythonware.com/products/pil/index.htm %define pyver %(python -c 'import sys; print sys.version[:3]') -Version: 1.1.5 -Release: 32 -License: Other License(s), see package, Python Copyright +Version: 1.1.6 +Release: 1 +License: Python Copyright, X11/MIT Group: Development/Libraries/Python Provides: _imaging.so _imagingtk.so python_imaging_lib pyimglib Requires: python >= %pyver, python < %{pyver}.99 @@ -24,12 +24,11 @@ Obsoletes: pyimglib Autoreqprov: on Summary: The Python Imaging Library - PIL -Source: Imaging-%{version}.tar.gz +Source: Imaging-%{version}.tar.bz2 Source1: pil-handbook.pdf -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 +Patch3: Imaging-1.1.6-ssize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -63,7 +62,6 @@ %prep %setup -n Imaging-%{version} -%patch0 %patch1 %patch2 %patch3 @@ -105,14 +103,21 @@ %files -f INSTALLED_FILES %defattr(-,root,root) -%doc CHANGES-115 README Docs Scripts Images pil-handbook.pdf +%doc CHANGES README Docs Scripts Images pil-handbook.pdf /usr/include/python%pyver/* %files sane -f INSTALLED_FILES_SANE %defattr(-,root,root) %doc Sane/sanedoc.txt Sane/README Sane/CHANGES -%changelog -n python-imaging +%changelog +* Thu Mar 29 2007 - matejcik@suse.cz +- update to 1.1.6 + - threading support for sane module + - NumPy array interface support + - converter to QImage + - new ImageMath module + - bugfixes * Mon Oct 23 2006 - meissner@suse.de - buildrequires libgphoto2-devel * Fri Oct 20 2006 - jmatejek@suse.cz ++++++ Imaging-1.1.5-ssize.patch -> Imaging-1.1.6-ssize.patch ++++++ --- python-imaging/Imaging-1.1.5-ssize.patch 2006-10-20 16:13:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-imaging/Imaging-1.1.6-ssize.patch 2007-03-29 20:12:10.000000000 +0200 @@ -1,6 +1,6 @@ --- _imaging.c +++ _imaging.c -@@ -297,6 +297,7 @@ +@@ -316,6 +316,7 @@ getlist(PyObject* arg, int* length, const char* wrong_length, int type) { int i, n; @@ -8,7 +8,7 @@ void* list; if (!PySequence_Check(arg)) { -@@ -304,7 +305,8 @@ +@@ -323,7 +324,8 @@ return NULL; } @@ -18,7 +18,7 @@ if (length && wrong_length && n != *length) { PyErr_SetString(PyExc_ValueError, wrong_length); return NULL; -@@ -1082,6 +1084,7 @@ +@@ -1125,6 +1127,7 @@ { Imaging image; int n, i, x, y; @@ -26,7 +26,7 @@ PyObject* data; double scale = 1.0; -@@ -1096,7 +1099,8 @@ +@@ -1139,7 +1142,8 @@ image = self->image; @@ -36,55 +36,95 @@ if (n > (int) (image->xsize * image->ysize)) { PyErr_SetString(PyExc_TypeError, "too many data entries"); return NULL; -@@ -2762,13 +2766,13 @@ +@@ -2880,7 +2884,7 @@ + + /* basic sequence semantics */ + +-static int ++static Py_ssize_t + image_length(ImagingObject *self) + { + Imaging im = self->image; +@@ -2889,7 +2893,7 @@ + } + + static PyObject * +-image_item(ImagingObject *self, int i) ++image_item(ImagingObject *self, Py_ssize_t i) + { + int x, y; + Imaging im = self->image; +@@ -2904,7 +2908,7 @@ } 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*/ - }; - - + (ssizeargfunc)0, /*sq_repeat*/ + (ssizeargfunc)image_item, /*sq_item*/ --- path.c +++ path.c -@@ -91,7 +91,8 @@ - int +@@ -111,6 +111,7 @@ PyPath_Flatten(PyObject* data, double **pxy) { -- int i, j, n; -+ int j; -+ Py_ssize_t i,n; + int i, j, n; ++ Py_ssize_t s; double *xy; + PyBufferProcs *buffer; + +@@ -147,7 +148,8 @@ + } + + j = 0; +- n = PyObject_Length(data); ++ s = PyObject_Length(data); ++ n = (s > INT_MAX) ? INT_MAX : s; + /* Just in case __len__ breaks (or doesn't exist) */ + if (PyErr_Occurred()) + return -1; +@@ -357,7 +359,7 @@ + } + + static PyObject* +-path_getitem(PyPathObject* self, int i) ++path_getitem(PyPathObject* self, Py_ssize_t i) + { + if (i < 0 || i >= self->count) { + PyErr_SetString(PyExc_IndexError, "path index out of range"); +@@ -368,7 +370,7 @@ + } + + static PyObject* +-path_getslice(PyPathObject* self, int ilow, int ihigh) ++path_getslice(PyPathObject* self, Py_ssize_t ilow, Py_ssize_t ihigh) + { + /* adjust arguments */ + if (ilow < 0) +@@ -385,7 +387,7 @@ + return (PyObject*) path_new(ihigh - ilow, self->xy + ilow * 2, 1); + } - if (PyPath_Check(data)) { -@@ -532,13 +533,13 @@ +-static int ++static Py_ssize_t + path_len(PyPathObject* self) + { + return self->count; +@@ -423,7 +425,7 @@ + } + + static int +-path_setitem(PyPathObject* self, int i, PyObject* op) ++path_setitem(PyPathObject* self, Py_ssize_t i, PyObject* op) + { + double* xy; + +@@ -556,7 +558,7 @@ } 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 = { + (ssizeargfunc)0, /*sq_repeat*/ + (ssizeargfunc)path_getitem, /*sq_item*/ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de