Commit Graph

5504 Commits

Author SHA1 Message Date
Josh Warner (Mac) 8bcdfb8325 Remove unnecessary double import. 2014-05-08 20:12:31 -05:00
Josh Warner (Mac) 77b036eb89 Merge branch 'master' of git://github.com/scikit-image/scikit-image into int_idx_patch 2014-05-08 19:57:06 -05:00
Josh Warner (Mac) 375e406f64 Use safe_as_int for input checking. 2014-05-08 19:56:47 -05:00
Johannes L. Schönberger a4d97f2a1c Merge pull request #992 from stefanv/warp_safe_output_shape
Safely handle non-integer output shape specification
2014-05-08 14:50:35 -04:00
Stefan van der Walt e9c0cde8d4 Move safe_as_int into utils 2014-05-08 20:11:17 +02:00
Stefan van der Walt a9dcdc3713 Use safe_as_int to check provided output shape 2014-05-08 19:28:29 +02:00
Stefan van der Walt b68b14f025 Merge pull request #8 from JDWarner/safe_int_casting
Add safe int casting utility function
2014-05-08 18:01:52 +02:00
Johannes L. Schönberger 82b404a672 Merge pull request #1004 from jni/viewer-examples
Viewer examples
2014-05-08 08:40:26 -04:00
Juan Nunez-Iglesias 35cfe6a8ea Merge pull request #1006 from stefanv/doc/regionprop_out
Clarify regionprops output
2014-05-08 19:11:40 +10:00
Stefan van der Walt 0b6e48fe2a Clarify regionprops output 2014-05-08 10:45:04 +02:00
Juan Nunez-Iglesias 53de0db164 Very minor text change 2014-05-08 18:19:57 +10:00
Juan Nunez-Iglesias 3d2af71744 Update description of viewer output in docs 2014-05-08 17:21:35 +10:00
Juan Nunez-Iglesias 040a3bf831 Merge pull request #1002 from JDWarner/asserttrue
Address PendingDeprecationWarnings in watershed tests
2014-05-08 16:26:42 +10:00
Juan Nunez-Iglesias 548423bb94 Update variable name for RGB line profile 2014-05-08 16:24:50 +10:00
Josh Warner (Mac) 1ca0eef825 FIX: Non-integer indexing deprecation warnings 2014-05-08 00:39:54 -05:00
Josh Warner (Mac) b8334e85c8 failUnless -> assertTrue 2014-05-07 23:16:42 -05:00
Juan Nunez-Iglesias d142748a86 Merge pull request #1001 from JDWarner/rw_transpose
FIX: Remove unnecessary .transpose introduced in PR #984
2014-05-08 14:15:44 +10:00
Josh Warner (Mac) 4aa162fc78 FIX: Remove unnecessary .transpose introduced in PR #984 2014-05-07 22:10:27 -05:00
Josh Warner (Mac) 07d3e6ede4 Convert name to _safe_as_int, output np.int64, expand Examples 2014-05-07 19:09:18 -05:00
Johannes L. Schönberger fbda63962a Merge pull request #984 from JDWarner/randwalk_trivialcheck
Random Walker improvements and checks for trivial cases
2014-05-07 14:33:09 -04:00
Josh Warner (Mac) 0d775c3aab Remove check for non-numeric values in spacing. 2014-05-07 02:42:38 -05:00
Josh Warner (Mac) e9c793eb17 FEAT: Shared function for safe int casting 2014-05-06 13:09:03 -05:00
Josh Warner (Mac) 0ac86b3e96 STY: More elegant and maintainable style per code review 2014-05-06 02:16:45 -05:00
Stefan van der Walt 4c7cd9bd65 Add unit test to catch non-integer output shape bug 2014-05-06 01:35:23 +02:00
Stefan van der Walt 00b4fa45e7 Always interpret provided shapes as int. Add a note on using output_shape for color images. 2014-05-06 01:35:23 +02:00
Stefan van der Walt 05f1f00e84 Merge pull request #998 from ahojnnes/python34
Fix cython warnings and "six" under python 3.4
2014-05-06 01:34:15 +02:00
Johannes Schönberger 5c2d8eb0aa Fix custom six issue in scipy 0.14 on python 3.4 2014-05-05 14:37:45 -04:00
Johannes Schönberger f4f509fa8d Fix cython compilation warnings 2014-05-05 14:37:15 -04:00
Johannes L. Schönberger dbb06dc3e0 Merge pull request #997 from stefanv/build/travis_numpy_py3
Fix Travis-CI builds with numpy 1.8 under Python 3
2014-05-05 14:33:10 -04:00
Stefan van der Walt 10459feefc Don't fail if .matplotlib dir already exists 2014-05-05 17:01:27 +02:00
Stefan van der Walt 1a0228727e Rename heading -> header 2014-05-05 16:34:31 +02:00
Stefan van der Walt c666b0f2d6 Remove deprecated --use-mirrors from pip calls 2014-05-05 16:34:31 +02:00
Stefan van der Walt b03d59f736 Print versions of software used in Travis output 2014-05-05 16:33:46 +02:00
Stefan van der Walt 9142c51cbb Replace broken _import_tools from numpy with Git version 2014-05-05 16:33:46 +02:00
Stefan van der Walt 5e4bce3f1a Merge pull request #986 from vighneshbirodkar/blob_example
Blob detection example
2014-05-01 12:40:29 +02:00
Josh Warner 79e22aef74 Merge pull request #991 from stefanv/apigen_origin_license
Fix broken link to origin apigen source
2014-04-29 18:07:25 -05:00
Stefan van der Walt 02198498c5 Fix broken link to origin apigen source 2014-04-30 00:39:24 +02:00
Johannes L. Schönberger 7688e57592 Merge pull request #971 from stefanv/bug/views_are_copies
Do not allow `view_as_*` to return copies (closes #866)
2014-04-27 20:16:41 -04:00
Stefan van der Walt 321d9f372c Add some PEP8 2014-04-28 01:10:15 +02:00
Vighnesh Birodkar cc76e8a1da Added method reference to example. 2014-04-28 02:23:48 +05:30
Vighnesh Birodkar 580f5d2dfd Corrected comment in example. 2014-04-28 00:33:19 +05:30
Vighnesh Birodkar 5b459a8e4b autopep8 changes. 2014-04-28 00:31:18 +05:30
Vighnesh Birodkar a82d814665 Changed example and hubble_deep_field doc string 2014-04-28 00:05:09 +05:30
Vighnesh Birodkar 336f117a01 Changed example to make code compact. 2014-04-27 11:52:00 +05:30
Vighnesh Birodkar 7738e65de8 hubble_deep_filed doc string changes. 2014-04-27 11:51:42 +05:30
Vighnesh Birodkar f1a8e6bd4c Tab to spaces. 2014-04-27 11:51:25 +05:30
Vighnesh Birodkar 0b4ad42dd1 pip command correction. 2014-04-27 11:51:15 +05:30
Vighnesh Birodkar b6224d0502 Changed travis.yml to install pillow. 2014-04-27 11:51:03 +05:30
Vighnesh Birodkar 0c1c62b415 Grammar corrections. 2014-04-27 11:50:49 +05:30
Vighnesh Birodkar e925d135c0 Grammar corrections. 2014-04-27 11:50:11 +05:30