Commit Graph

7427 Commits

Author SHA1 Message Date
Rebecca fd94ca6ff5 renamed gabors 2014-11-07 16:04:53 +02:00
Rebecca 49acabc355 adding name to contributors 2014-11-07 16:04:53 +02:00
Rebecca 1b217f971e replacing lena in examples and most tests 2014-11-07 16:01:23 +02:00
Stefan van der Walt e8967abe78 Merge pull request #1200 from blink1073/multiimage_tifffile
Standardize handling of multi-image files
2014-11-07 15:24:34 +02:00
Steven Silvester ad3939784c Indentation fix 2014-11-07 15:23:38 +02:00
Steven Silvester 59842b34d8 Test collection slicing with multi-images. 2014-11-07 15:22:20 +02:00
Steven Silvester b5a988a52f Close the image file pointer when done. 2014-11-07 15:22:20 +02:00
Steven Silvester 4485f6d6c1 Add tests for ImageCollection with multi_images 2014-11-07 15:22:20 +02:00
Steven Silvester b7da8009d2 Clean up docstring 2014-11-07 15:22:20 +02:00
Steven Silvester 0d76827734 Allow keyword arguments to imread 2014-11-07 15:22:20 +02:00
Steven Silvester 502f6af481 Pep8 cleanup 2014-11-07 15:22:19 +02:00
Steven Silvester 76fc909b62 Finish merging multiimage capability into collections 2014-11-07 15:22:19 +02:00
Steven Silvester b4838c3bd9 Fix failing tests 2014-11-07 15:22:19 +02:00
Steven Silvester d27fadb5cf Avoid circular import 2014-11-07 15:22:19 +02:00
Steven Silvester 305abf6d0c Change MultiImage to use new imread. 2014-11-07 15:22:19 +02:00
Steven Silvester bf9bcaaf0d Add a note about sequential access. 2014-11-07 15:22:19 +02:00
Steven Silvester 1c0d86a48d Allow PIL imread to read multiple images 2014-11-07 15:22:19 +02:00
Steven Silvester 4298b8babc Allow multiple frames in PIL data in imread 2014-11-07 15:22:19 +02:00
Steven Silvester 39d9dcf20e Fix implementation of pil_to_ndarray in MultiImage 2014-11-07 15:22:19 +02:00
Steven Silvester 93c6d010e6 Use pil_to_ndarray to load PIL images 2014-11-07 15:22:19 +02:00
Steven Silvester 9a126e7009 Add a comment about reading in order 2014-11-07 15:22:19 +02:00
Steven Silvester d853b68f96 Fix problems from rebase. 2014-11-07 15:22:19 +02:00
Steven Silvester 945e163867 Add animated gif, a test for it, and tests without conserve_memory.
Add animated gif, and a test for it, plus tests without conserve_memory

Add the gif file
2014-11-07 15:22:18 +02:00
Steven Silvester 49a92482cb Cleanup 2014-11-07 15:22:18 +02:00
Steven Silvester caaf37ec0c Fix implementation errors 2014-11-07 15:22:18 +02:00
Steven Silvester 09e6439310 Update multi_image test and install tifffile for travis. 2014-11-07 15:22:18 +02:00
Steven Silvester 732c9c37cc Add tifffile support for MultiImage 2014-11-07 15:22:18 +02:00
Steven Silvester a70a4933aa Fix implementation errors 2014-11-07 15:22:18 +02:00
Steven Silvester 0134946fc7 Update multi_image test and install tifffile for travis. 2014-11-07 15:22:18 +02:00
Steven Silvester e0e4fe26f1 Add tifffile support for MultiImage 2014-11-07 15:22:18 +02:00
Stefan van der Walt 8bba07a7f2 Merge pull request #1171 from jjhelmus/unwrap_phase_3d_bug
BUG: segmentation fault when unwrapping 3d image
2014-11-07 13:39:18 +02:00
Jonathan Helmus 25653dc288 TST: Unit test to check for 3d unwrap seg fault
Added a unit test to check for bug in unwrap_phase which causes
a segmentation fault when the middle dimension is connected.
2014-11-06 21:03:14 -06:00
Steven Silvester 2374b6a1ff Merge pull request #1219 from jni/reconstruct-error
Raise meaningful error when wrong "method" passed to `reconstruct`
2014-11-05 20:42:35 -06:00
Steven Silvester 66aaf71943 Merge pull request #1217 from jni/morpho-out
Allow discontiguous out arrays in `skimage.morphology.grey`
2014-11-05 20:35:56 -06:00
Juan Nunez-Iglesias 39d042e4ba Test correct error for wrong method in reconstruct 2014-11-06 10:29:43 +11:00
Juan Nunez-Iglesias f52f2c1779 Raise meaningful error in reconstruct w bad method
If a method other than 'erosion' or 'dilation' was passed, an
`UnboundLocalVariable` error for `pad_value` was raised, which made it
difficult to determine the source of the error. Now, an eloquent
`ValueError` is raised instead.

See #1218.
2014-11-06 10:27:43 +11:00
Juan Nunez-Iglesias 1a3ec0299c Add tests for discontiguous out arrays in grey morpho 2014-11-04 15:20:21 +11:00
Juan Nunez-Iglesias d7fdfebb96 Remove contiguous conversion for out array 2014-11-04 15:08:38 +11:00
Juan Nunez-Iglesias 59a9cfe4eb Merge pull request #1214 from blink1073/remove-null-plugin
Remove null_plugin in Favor of  the pil_plugin
2014-11-03 01:56:32 +11:00
Steven Silvester 6906dbc957 Use matplotlib as the default imshow 2014-11-02 07:08:43 -06:00
Steven Silvester dfffd07e4a Clean up the imports in the pil_plugin 2014-11-02 07:03:15 -06:00
Steven Silvester 91266c5702 Update tests to use default plugins. 2014-11-02 07:03:01 -06:00
Steven Silvester 21d6ef15ec Remove null plugin since we have the pil plugin as a requirement 2014-11-02 06:28:17 -06:00
Steven Silvester 4eef9c5f75 Merge pull request #1211 from stefanv/bug/setup_dependency_error
Print correct version when dependency is not satisfied
2014-11-02 06:13:58 -06:00
Steven Silvester d10ab06102 Merge pull request #1210 from stefanv/doc/io_null_doc
Update error message for no plugins
2014-11-02 06:13:19 -06:00
Josh Warner 45b3826137 Merge pull request #1213 from blink1073/fix-windows-install
Use Recommended "extern" Import Method for Cython
2014-10-30 23:07:49 -05:00
Steven Silvester 86fdbf460f Use recommended extern import method for cython 2014-10-30 20:43:16 -05:00
Stefan van der Walt 92929fc417 Print correct version when dependency is not satisfied 2014-10-29 13:39:42 +02:00
Stefan van der Walt 99818f02eb Update error message for no plugins 2014-10-29 13:38:40 +02:00
Matěj Týč 815ea29d26 Added some comments + requested reformatting 2014-10-29 00:58:01 +01:00