From e9f111d011af4124d46c747f4b79839023580ac0 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Tue, 17 Jul 2012 14:47:15 -0400 Subject: [PATCH 1/5] PKG: Add python-support to build dependencies (closes Debian-681896). --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 98e05352..1d0acd61 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: optional Maintainer: Stefan van der Walt Uploaders: Yaroslav Halchenko -Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.6.6-3~), python-numpy, python-sphinx, python-nose, python-setuptools, cython (>= 0.13), python-matplotlib (>= 1.0), python-scipy, libfreeimage3, python-imaging +Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.6.6-3~), python-numpy, python-sphinx, python-nose, python-setuptools, cython (>= 0.13), python-matplotlib (>= 1.0), python-scipy, libfreeimage3, python-imaging, python-support (>= 0.6) Standards-Version: 3.9.3 XS-Python-Version: >= 2.6 Homepage: http://scikits-image.org From a454930da8eeaabe6d4abd19ec53244a82430651 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Thu, 12 Jul 2012 10:44:34 -0700 Subject: [PATCH 2/5] Merge pull request #214 from cgohlke/patch-1 BUG: Fix io.imsave() problems with passing arguments to plugin "freeimage". --- skimage/io/_plugins/freeimage_plugin.py | 30 ++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/skimage/io/_plugins/freeimage_plugin.py b/skimage/io/_plugins/freeimage_plugin.py index 5d023909..9cb9c467 100644 --- a/skimage/io/_plugins/freeimage_plugin.py +++ b/skimage/io/_plugins/freeimage_plugin.py @@ -153,20 +153,20 @@ class FI_TYPES(object): } fi_types = { - (numpy.uint8, 1): FIT_BITMAP, - (numpy.uint8, 3): FIT_BITMAP, - (numpy.uint8, 4): FIT_BITMAP, - (numpy.uint16, 1): FIT_UINT16, - (numpy.int16, 1): FIT_INT16, - (numpy.uint32, 1): FIT_UINT32, - (numpy.int32, 1): FIT_INT32, - (numpy.float32, 1): FIT_FLOAT, - (numpy.float64, 1): FIT_DOUBLE, - (numpy.complex128, 1): FIT_COMPLEX, - (numpy.uint16, 3): FIT_RGB16, - (numpy.uint16, 4): FIT_RGBA16, - (numpy.float32, 3): FIT_RGBF, - (numpy.float32, 4): FIT_RGBAF + (numpy.dtype('uint8'), 1): FIT_BITMAP, + (numpy.dtype('uint8'), 3): FIT_BITMAP, + (numpy.dtype('uint8'), 4): FIT_BITMAP, + (numpy.dtype('uint16'), 1): FIT_UINT16, + (numpy.dtype('int16'), 1): FIT_INT16, + (numpy.dtype('uint32'), 1): FIT_UINT32, + (numpy.dtype('int32'), 1): FIT_INT32, + (numpy.dtype('float32'), 1): FIT_FLOAT, + (numpy.dtype('float64'), 1): FIT_DOUBLE, + (numpy.dtype('complex128'), 1): FIT_COMPLEX, + (numpy.dtype('uint16'), 3): FIT_RGB16, + (numpy.dtype('uint16'), 4): FIT_RGBA16, + (numpy.dtype('float32'), 3): FIT_RGBF, + (numpy.dtype('float32'), 4): FIT_RGBAF } extra_dims = { @@ -608,7 +608,7 @@ def _array_to_bitmap(array): else: n_channels = shape[0] try: - fi_type = FI_TYPES.fi_types[(dtype.type, n_channels)] + fi_type = FI_TYPES.fi_types[(dtype, n_channels)] except KeyError: raise ValueError('Cannot write arrays of given type and shape.') From d30192bd70c2bb2e21204e5fe3ad56403b8201b2 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Tue, 17 Jul 2012 15:00:21 -0400 Subject: [PATCH 3/5] PKG: Release 0.6.1 bugfix. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 63176520..870430ff 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ MAINTAINER_EMAIL = 'stefan@sun.ac.za' URL = 'http://scikits-image.org' LICENSE = 'Modified BSD' DOWNLOAD_URL = 'http://github.com/scikits-image/scikits-image' -VERSION = '0.6' +VERSION = '0.6.1' import os import setuptools From c82f1ed6b6d1f3d511ce4ec189fb99cfb29da3a2 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Tue, 17 Jul 2012 15:04:06 -0400 Subject: [PATCH 4/5] Changelog for 0.6.1-1. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 39ace9ba..b68f3fac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +skimage (0.6.1-1) unstable; urgency=low + + * Upstream bugfix release. + * Add python-support as build dependency (Closes: #681896). + + -- Stefan van der Walt Tue, 17 Jul 2012 15:03:25 -0400 + skimage (0.6-1) unstable; urgency=low * New upstream release From 433e329661c47d55793c85de9e6cb636e86dfb57 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Tue, 17 Jul 2012 17:40:10 -0400 Subject: [PATCH 5/5] PKG: More detailed changelog. --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b68f3fac..842e4c51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ skimage (0.6.1-1) unstable; urgency=low - * Upstream bugfix release. + * Upstream bugfix release (correctly compare dtypes in the freeimage loader + on all platforms). * Add python-support as build dependency (Closes: #681896). -- Stefan van der Walt Tue, 17 Jul 2012 15:03:25 -0400