Commit Graph

8104 Commits

Author SHA1 Message Date
Steven Silvester cc5d574d34 Upgrade the vendored tifffile 2016-03-16 05:46:20 -05:00
Steven Silvester 401c1fd9c7 Merge pull request #2001 from sciunto/doc_userguide
[DOC] add link to guide
2016-03-14 07:02:44 -05:00
François Boulogne 44266f42c4 [DOC] add link to guide
extra fix
2016-03-13 18:19:19 +01:00
Josh Warner 5dcac33bf8 Merge pull request #1999 from grlee77/ssim_err
DOC: Suggest multichannel=True in compute_ssim error
2016-03-11 11:02:55 -06:00
Gregory R. Lee 068663b7fe explicitly suggest using multichannel in compute_ssim error message 2016-03-11 10:11:46 -05:00
Steven Silvester 16fbf6737a Merge pull request #1994 from grlee77/ssim_fix
avoid deprecation warnings when calling compute_ssim with multichannel=True
2016-03-09 15:18:24 -06:00
Gregory R. Lee 5ac3255065 FIX: remove use of deprecated call to structural_similarity from within compute_ssim 2016-03-09 15:00:05 -05:00
Johannes Schönberger a34a301f1f Merge pull request #1992 from stefanv/clean_all_md5
Remove all .md5 files on clean
2016-03-09 13:44:25 +01:00
Stefan van der Walt 08a08d747d Remove all .md5 files on clean 2016-03-09 00:28:42 -08:00
Stefan van der Walt f302c45b6d Merge pull request #1990 from rodrigob/patch-2
Also expose rgb2gray as rgb2grey
2016-03-08 10:15:10 -08:00
Rodrigo Benenson 23cfaec724 Follow-up of PR #1989
exposing grey2rgb at the module level.
2016-03-08 17:01:00 +01:00
Steven Silvester 701fa1b1fd Merge pull request #1989 from rodrigob/patch-1
rgb2grey -> grey2rgb
2016-03-08 09:44:55 -06:00
Rodrigo Benenson 362b68c055 rgb2grey -> grey2rgb
Simply added `grey2rgb = gray2rgb` to match the existing rgb2grey.
2016-03-08 15:56:26 +01:00
Stefan van der Walt b0e12ea530 Merge pull request #1980 from pradyumnanpk/match_template-enhancement
Pre-calculate tempate mean
2016-03-08 02:24:09 -08:00
Stefan van der Walt c6cde6c028 Merge pull request #1987 from soupault/fix_init_inpaint
Add inpaint to module init
2016-03-07 15:57:57 -08:00
Egor Panfilov caa2d220b6 Changed docsting sections order 2016-03-08 01:35:48 +03:00
Egor Panfilov dfffc55c36 Added inpaint to module init 2016-03-07 23:36:26 +03:00
Stefan van der Walt b91bb168eb Add .in files to source distribution 2016-03-07 12:35:58 -08:00
Stefan van der Walt c48302d70b Bring release notes and API changes in sync 2016-03-07 12:35:58 -08:00
Josh Warner 6ecee1d56f Merge pull request #1985 from stefanv/remove_lena
Remove lena image from test suite
2016-03-07 07:33:23 -06:00
Emmanuelle Gouillart cc4dbc0314 Merge pull request #1986 from stefanv/cython_version_check
Warn if user tries to build with older Cython version
2016-03-07 13:14:25 +01:00
Stefan van der Walt e1c2ea29dd Warn if user tries to build with older Cython version 2016-03-07 01:38:22 -08:00
Stefan van der Walt 18da19e7b9 Remove left-over mentions in test docstrings of lena 2016-03-07 00:39:39 -08:00
Stefan van der Walt 78c0abeb17 Fix 2.6 compatibility 2016-03-07 00:37:26 -08:00
Stefan van der Walt 89136157bb Remove lena image from test suite.
Results from the morphology module were compared against output from the
corresponding MATLAB functions, as applied to the lena test image.  This image
does not conform to the Debian Free Software Guidelines and had to be removed.
The output is now tested against results generated with the current version of
scikit-image (0.12.0), which is known to be correct due to the comparison
described above.
2016-03-06 23:16:11 -08:00
Stefan van der Walt d8c18a9f15 Update version to 0.13dev 2016-03-06 18:25:28 -08:00
Stefan van der Walt 2436199022 Merge 'v0.12.x' branch 2016-03-06 18:24:06 -08:00
Stefan van der Walt 4e3b031567 Update v0.12 release instructions.
We forgot to mention the recent addition of 3D skeletonization.
2016-03-06 18:01:47 -08:00
emmanuelle 50fa219975 Updated docversion.js v0.12.0 2016-03-05 17:44:41 +01:00
emmanuelle d5f4f32162 Modified bento.info and skimage/__init__.py with 0.12.0 2016-03-05 17:41:51 +01:00
Josh Warner 6fb9bf0f83 Merge pull request #1981 from pradyumnanpk/bilateral_filter-enhancement
FIX: Scale bilateral filter win_size with sigma
2016-03-04 14:34:40 -06:00
Steven Silvester 29fa9e3047 Merge pull request #1937 from stefanv/test_parallel_fail
Raise at least one error for parallel tests.
2016-03-04 13:47:19 -06:00
Stefan van der Walt edb147d22a Merge pull request #1970 from alexandrejaguar/master
Format clean-ups in convex hull and otsu
2016-03-04 11:23:45 -08:00
Pradyumna Narayana 16ed4ed865 Corrected a grammatical error in deprecated message. No functional change. 2016-03-04 09:29:32 -07:00
Pradyumna Narayana 010df48453 Added deprecated kwargs to TODO.txt 2016-03-04 08:35:32 -07:00
Pradyumna Narayana f069aada3c Supports skimage_range. Displays deprecated warning when used. Two test cases to test this functionality. 2016-03-04 08:34:47 -07:00
Juan Nunez-Iglesias 9e8ba42fb4 Merge pull request #1982 from stefanv/orb_no_of_keypoints
Fix ORB test
2016-03-04 13:37:09 +11:00
Stefan van der Walt 0ccff88945 Fix ORB test
In a previous PR, the scales were incorrectly copy-pasted.
2016-03-03 17:49:58 -08:00
Steven Silvester 729328ed6d Merge pull request #1905 from stefanv/novice_undo
Add comparison and reset capability to novice module
2016-03-03 18:38:17 -06:00
Josh Warner deaac9cce5 Merge pull request #1976 from stefanv/mpl_warnings
Fix tests for matplotlib warnings generated by Template backend
2016-03-03 18:28:05 -06:00
Pradyumna Narayana 428cc3daeb Casted ceil to int such that win_size is an int. 2016-03-03 12:27:23 -07:00
Pradyumna Narayana ecf90e1cca Added the chnage to comments 2016-03-03 12:01:57 -07:00
Pradyumna Narayana 9f3fc737ba sigma_range is renamed to sigma_color and win_size scales with sigma_spatial 2016-03-03 12:00:15 -07:00
Pradyumna Narayana 2c39c773f4 Template mean is precalculated and referenced 2016-03-03 11:45:09 -07:00
Stefan van der Walt 7caf88f6ee Fix assertion in novice test for older numpy versions
For older versions of numpy, `assert_equal(a, b)` failed for arbitrary objects
`a` and `b` even if they had ``__eq__`` defined.  This is now fixed, but the
test is changed to use ``assert_true(a == b)`` to be backward compatible.
2016-03-02 18:59:27 -08:00
Stefan van der Walt 9e9207c718 Catch known Matplotlib warnings
`tight_layout` is not supported on all backends, so Matplotlib may raise a
warning, saying it is falling back to the Agg backend.  Since we use the
'Template' backend in our tests, this warning pops up from time to time.
2016-03-02 18:54:14 -08:00
Stefan van der Walt 453efe974d Ensure array data is always uint8 2016-03-02 17:20:19 -08:00
Stefan van der Walt a8057ed941 Add reset and compare to novice module
- Reset restores the image to the original.
- Compare displays the original and the modified image side-by-side.
2016-03-02 16:22:24 -08:00
Stefan van der Walt 3ffca2fdbd Extend plugins with imshow_collection
A first implementation is made for Matplotlib.
2016-03-02 16:22:24 -08:00
Josh Warner 0d7289ea76 Merge pull request #1972 from jni/bump-cython
Bump Cython version to 0.23 in DEPENDS.txt
2016-03-01 07:19:09 -06:00