Commit Graph
8324 Commits
Author SHA1 Message Date
Josh Warner f2d9cf4d59 Merge pull request #1877 from OrkoHunter/test_hog_lena_deprecate
TST: Use Astronaut in place of Lena in test_hog.py
2016-01-17 21:09:02 -07:00
Juan Nunez-Iglesias e53d7daaa3 Merge pull request #1804 from soupault/inpainting
ENH: Inpainting with biharmonic equation
2016-01-18 10:56:24 +11:00
Juan Nunez-Iglesias b7fa0acd86 Merge pull request #1876 from OrkoHunter/threshold_otsu_grayscale
Show warnings for input image type in threshold_otsu
2016-01-18 10:38:17 +11:00
Panfilov Egor f08ddcdf5d Merge pull request #1880 from OrkoHunter/fix_doc
Fix circular mask example in the user_guide
2016-01-17 10:25:41 +03:00
Egor Panfilov 3ae2f1236b TST, DOC: Added test for 3D spatial data, cleaned up gallery example 2016-01-16 20:02:24 +03:00
Himanshu Mishra b4bf4ed768 Fix circular mask example in the user_guide 2016-01-16 10:47:09 +05:30
Egor Panfilov 98fec5211a FIX: Returned handle for empty input arrays 2016-01-15 20:04:08 +03:00
Egor Panfilov 893d937491 ENH: Moved nested functions, refactor code 2016-01-15 13:59:32 +03:00
Himanshu Mishra a2d75de834 Add expected_warnings to the tests using threshold_otsu 2016-01-15 10:34:26 +05:30
Himanshu Mishra 296438d08e Raise a warning if the image is not grayscale 2016-01-15 10:06:43 +05:30
Himanshu Mishra 421ef45b42 Use astronaut image instead of lena in test_hog.py 2016-01-14 23:42:52 +05:30
Himanshu Mishra f034081650 Document the input image type 2016-01-14 13:49:17 +05:30
Stefan van der Walt 2487681272 Merge pull request #1866 from sergiopasra/deprecate-lena
Add deprecation warning to `data.lena`
2016-01-13 06:45:49 -08:00
Sergio Pascual 49eb2f3a54 Suggest 'skimage.data.astronaut' as alternative test image 2016-01-13 11:10:13 +01:00
François Boulogne be993d44b1 Merge branch 'master' of git://github.com/scikit-image/scikit-image 2016-01-11 20:49:30 -05:00
Juan Nunez-Iglesias 9c93816dd8 Merge pull request #1495 from vighneshbirodkar/edge_rag
Region boundary based RAGs
2016-01-11 11:13:35 +11:00
Vighnesh Birodkar 22bf68d9b4 removed failing doctest line 2016-01-08 21:49:01 -05:00
Vighnesh Birodkar 753c8caf4e correct variable name mistake 2016-01-08 14:11:56 -05:00
Vighnesh Birodkar 79c9637e11 Merge pull request #1 from jni/edge-rag-fixup
Edge rag modifications
2016-01-08 13:30:57 -05:00
Juan Nunez-Iglesias 802214d5ac Hold pixel count in mean boundary RAG edges
This value is needed to combine edges when merging nodes.
2016-01-08 22:11:31 +11:00
Juan Nunez-Iglesias 30145ab7f4 Use function to update graph edges from CSR 2016-01-08 22:10:20 +11:00
Juan Nunez-Iglesias f9dfa1d81d Make mean boundary RAG testing more robust 2016-01-08 17:25:10 +11:00
Sergio Pascual c6c8ff9359 Add deprecation warning to 'data.lena()' 2016-01-08 00:05:45 +01:00
Vighnesh Birodkar def8ca7f75 change mcap to viridis 2016-01-06 21:29:42 -05:00
Vighnesh Birodkar 772d1ccc15 changed colormap to jet 2016-01-06 20:23:55 -05:00
Vighnesh Birodkar a4a406349b moved example file 2016-01-06 19:58:40 -05:00
Vighnesh Birodkar ea18fcb99b use as strided 2016-01-06 16:23:43 -05:00
Vighnesh Birodkar a5f6db59cb doc example 2016-01-06 15:42:10 -05:00
Vighnesh Birodkar 422dfc6c22 cleanup 2016-01-06 15:17:48 -05:00
Vighnesh Birodkar e8f2805d64 changed to eosion/dilation logic 2016-01-06 15:07:35 -05:00
Vighnesh Birodkar a95c0bdddc passing selem argument 2016-01-06 15:07:35 -05:00
Vighnesh Birodkar 4c05e65670 changed logic to use erosion/dilation 2016-01-06 15:07:35 -05:00
Vighnesh BirodkarandVighnesh Birodkar 4041fc6354 corrected colors import 2016-01-06 15:06:18 -05:00
Vighnesh BirodkarandVighnesh Birodkar caba3041d1 indentation correction 2016-01-06 15:06:18 -05:00
Vighnesh BirodkarandVighnesh Birodkar 3cf6c8b1ce removed unnecessary statement 2016-01-06 15:06:18 -05:00
Vighnesh BirodkarandVighnesh Birodkar 1769cdddcf added boundary rag construction 2016-01-06 15:06:18 -05:00
François Boulogne 514526ace0 Merge branch 'master' of git://github.com/scikit-image/scikit-image 2016-01-06 09:31:54 -05:00
Emmanuelle Gouillart 8f2839e1b3 Merge pull request #1747 from JGoutin/OptimizeLevel2Compilation-patch
Import fail if python is running with -OO
2015-12-30 23:14:03 +01:00
Emmanuelle Gouillart 33a2182e06 Merge pull request #1705 from deledalle/ref_nlmeans
DOC : add ref to nlmeans
2015-12-30 22:06:19 +01:00
Emmanuelle Gouillart 732df5fc55 Merge pull request #1850 from jwiggins/fix/potential-bilateral-leak
FIX: Move a argument check to avoid leaking malloc'd arrays.
2015-12-30 21:43:18 +01:00
Egor Panfilov 89784631e7 ENH: Massively reworked code to enable nD-support 2015-12-30 22:45:27 +03:00
Juan Nunez-Iglesias 2e812e0b12 Merge pull request #1505 from emmanuelle/regionprops3d
Add preliminary and incomplete 3D support to regionprops.
2015-12-29 11:59:48 +11:00
emmanuelle 6c9325aadf Minor fixes: errant indent, functools.wraps and python3 style 2015-12-28 21:13:22 +01:00
John Wiggins 72f542100e Use np.empty() instead of malloc/free in _denoise_bilateral. 2015-12-27 23:29:59 -06:00
Steven Silvester 99871d77b4 Merge pull request #1849 from emmanuelle/fix_contribs
contribs.py: fixed the case of empty string
2015-12-27 10:14:48 -06:00
emmanuelle f345291e54 Mentioned 2.6 hack for contribs.py in TODO.txt 2015-12-27 17:00:28 +01:00
emmanuelle 13c4f3cea4 Execute contribs.py in travis_script.sh
Added tag of previous release

Only recent commits for contribs.py so that Travis is happy

Do not execute contribs.py for Python 2.6

Do not execute contribs.py for python 2.6
2015-12-26 23:52:39 +01:00
John Wiggins e528d47d5b FIX: Move a argument check to avoid leaking malloc'd arrays. 2015-12-26 10:55:28 -06:00
Steven Silvester b4793caebd Remove debug message 2015-12-25 15:13:11 -06:00
Steven Silvester 0d73999cfd Allow axes to be provided to imshow and fix colorbar
Allow axes to be provided to imshow and fix colorbar

Allow axes to be provided to imshow and fix colorbar

Allow axes to be provided to imshow and fix colorbar

Use tight layout by default

Try and fix appveyor issue

Handle deprecation warning on appveyor

Pin the colorbar to the image using box-forced

Fix tests again

Update function signature

Update function signature

Fix imshow call

Fix docstring with utf characters

Remove kwargs
2015-12-25 15:12:53 -06:00