Commit Graph
21 Commits
Author SHA1 Message Date
Juan Nunez-Iglesias ea1566fffb Fix image dimension sanitizing at function start
`np.atleast_3d` will add a singleton dimension at the end of an array
if needed. This is not the correct thing to do if `multichannel=False`
based on the subsequent lines. If the input image was 2D with shape
`(40, 50)` and `multichannel=False`, then `np.atleast_3d` gives it
shape `(40, 50, 1)`, and then, because `multichannel=False`, the rest
of the code gives it shape `(40, 50, 1, 1)`. This results in the final
returned array having shape `(40, 50, 1)` instead of the desired
`(40, 50)`.

This commit fixes that and updates the test to detect this failure.
2013-09-16 16:02:24 +10:00
Johannes Schönberger 05aaeef5ac Change default value of sigma 2013-09-14 10:08:07 +02:00
Johannes Schönberger 8137c41e22 Add optional description to parameters 2013-09-03 10:48:53 +02:00
Johannes Schönberger 770e28d2bb Rename clusters to segments 2013-09-03 10:47:49 +02:00
Johannes Schönberger d9e64b43e6 Make image C-contiguous 2013-09-03 08:40:18 +02:00
Johannes Schönberger 80ed875147 Add missing rgb2lab import 2013-09-01 17:12:10 +02:00
Johannes Schönberger a6d1b10e25 Use absolute imports 2013-09-01 16:53:05 +02:00
Johannes Schönberger eeddd9e35f Revert multichannel magic and improve parameter docs 2013-09-01 16:46:01 +02:00
Johannes Schönberger e5eea8e135 Improve documentation of sigma 2013-09-01 16:46:01 +02:00
Johannes Schönberger 471b293a9e Remove unnecessary parameters and update doc string 2013-09-01 16:46:00 +02:00
Johannes Schönberger 6b5556b279 Reduce memory footprint 2013-09-01 16:46:00 +02:00
Johannes Schönberger fd729a4e30 Improve SLIC 2013-09-01 16:46:00 +02:00
Juan Nunez-Iglesias 878c562a45 Replace 'ratio' kwarg with 'compactness' in SLIC 2013-07-29 00:28:38 +10:00
Juan Nunez-Iglesias af3ea5f817 Remove unused 'ratio' argument from _slic_cython 2013-07-25 00:23:01 +10:00
Juan Nunez-Iglesias aadd346964 Fix ratio scaling in SLIC 2013-07-22 20:19:24 +10:00
Juan Nunez-Iglesias 8c2011d4f9 Add UTF8 coding declaration to slic_superpixels.py 2013-07-02 13:22:14 +02:00
Juan Nunez-Iglesias 69fb3fb7ba Make means array contiguous for numpy <= 1.6.1 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias 55fe6ce2d6 Bug fix: spatial vs image dimension comparison reversed 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias 5a43e03061 Bug fix: add z dimension regardless of multichannel 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias e9c5f666ae Use educated guesses for presence of color channels in SLIC 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias e757b9ae06 Rename slic.py to avoid name conflicts 2013-07-02 13:22:13 +02:00