Commit Graph
7695 Commits
Author SHA1 Message Date
Warren Weckesser 6b908c1bb1 BUG: io: imread in the PIL plugin drops indexed PNG alpha channel.
When using the PIL plugin to read an indexed PNG file that has
an alpha channel, the alpha channel would be lost.
2015-12-15 12:30:43 -05:00
Juan Nunez-Iglesias 2f3bc7f08d Merge pull request #1828 from stefanv/radon_circle_warn
radon transform: ignore values outside circle
2015-12-15 12:57:55 +11:00
Stefan van der Walt 74a015d1d4 radon transform: when circle=True, ignore values outside circle without throwing an error (closes #1808) 2015-12-14 17:13:29 -08:00
Johannes Schönberger 86052d67bd Merge pull request #1815 from stefanv/regionprops_cached_decorator
Regionprops cached decorator
2015-12-14 15:12:39 -05:00
Stefan van der Walt 4aa08fe353 Simplify cache 2015-12-14 00:42:29 -08:00
Stefan van der Walt bf5ba4540b Fix doc setting for Python 2.x 2015-12-14 00:42:29 -08:00
Stefan van der Walt 024dd34b19 Clean up style and PEP8 2015-12-14 00:42:29 -08:00
Stefan van der Walt 5e848f5889 Auto-generate _RegionProps property docstrings 2015-12-14 00:42:29 -08:00
Juan Nunez-Iglesias 975d1a4cc0 Merge pull request #1792 from scottsievert/fftconvolve
Uses fftconvolve instead of convolve2d for speedups
2015-12-14 16:37:18 +11:00
Juan Nunez-Iglesias 477f39634a Merge pull request #1825 from stefanv/travis_pyamg
Re-enable pyamg, since release 3.0.2 closes #1788
2015-12-14 16:36:38 +11:00
Stefan van der Walt 084ad3c22b Merge pull request #1821 from jni/integral-image-fixes
Add deprecation path to skimage.transform.integrate API change
2015-12-13 20:36:16 -08:00
Stefan van der Walt 8be859829e Re-enable pyamg, since release 3.0.2 closes #1788
This reverts commit a9b4e78934.
2015-12-13 19:52:36 -08:00
Johannes Schönberger 7aa680ccd1 Merge pull request #1768 from stefanv/mailmap
Add preliminary mailmap
2015-12-13 22:27:11 -05:00
Steven Silvester d99f21806d Merge pull request #1824 from stefanv/travis_pyamg
Disable pyamg on Travis until #1788 is closed
2015-12-13 20:14:19 -06:00
Stefan van der Walt b0301a2119 Add preliminary mailmap and tool to generate it 2015-12-13 18:10:28 -08:00
Stefan van der Walt a9b4e78934 Disable pyamg on Travis until #1788 is closed 2015-12-13 17:52:43 -08:00
scottsievert 2892e90abc removes paren 2015-12-13 16:59:59 -06:00
scottsievert 4d6c9e7b84 now N dimensional, changes constant, cleans and comments 2015-12-13 14:57:52 -06:00
Steven Silvester 5b8fd77b80 Merge pull request #1691 from juliusbierk/active-contour-model
New feature: Active contour model
2015-12-13 14:57:10 -06:00
Juan Nunez-Iglesias 0bc3ad8f79 Restore vectorised integrate deprecated behaviour 2015-12-13 16:25:29 +11:00
Juan Nunez-Iglesias 3899c571b7 Test individual coordinates for integrate in doctest 2015-12-13 14:55:44 +11:00
Juan Nunez-Iglesias c7243e7383 Allow passing individual coordinate tuples to integrate 2015-12-13 14:55:23 +11:00
Juan Nunez-Iglesias 5df9e0cf70 Update incorrect version number in docstring 2015-12-13 14:54:57 +11:00
Juan Nunez-Iglesias 74f8ae19f6 Add note in TODO for deprecated use of integrate() 2015-12-13 14:47:01 +11:00
Juan Nunez-Iglesias 458dc15225 Add deprecation warning for old syntax for integrate() 2015-12-13 14:45:45 +11:00
Juan Nunez-Iglesias 38b1880ef7 Update docstring comments for integrate function 2015-12-13 14:35:59 +11:00
scottsievert 3fd47091dd adds comment explaining time_ratio decision 2015-12-12 21:15:01 -06:00
Juan Nunez-Iglesias 827e4b11c9 Merge pull request #1819 from blink1073/doc-building-docs
Move the doc build readme to contributing.txt
2015-12-13 13:42:58 +11:00
Juan Nunez-Iglesias 91d3e81927 Merge pull request #1820 from blink1073/deprecate-2.6
Start deprecation of python 2.6
2015-12-13 13:40:08 +11:00
Steven Silvester 683ecde2e1 Start deprecation of python 2.6 2015-12-12 20:27:21 -06:00
Steven Silvester 9c37e8e515 Move the doc build readme to contributing.txt 2015-12-12 20:09:59 -06:00
scottsievert 3f3b705ebd fixes import, tuple addition 2015-12-12 19:26:10 -06:00
Juan Nunez-Iglesias 8b0d5113eb Merge pull request #1818 from blink1073/improve_downcast
Add support for casting from 64bit integers and use smart downcast
2015-12-13 10:54:39 +11:00
Juan Nunez-Iglesias 5eaf2010df Merge pull request #953 from syedTabish/Issue949
Update integral image to support nD images
2015-12-13 10:53:09 +11:00
Steven Silvester 4e00d45f68 Improve warning message 2015-12-12 17:07:36 -06:00
Steven Silvester f3965885e8 Fix failing test 2015-12-12 16:42:54 -06:00
Steven Silvester be7161d350 Add debug print 2015-12-12 16:20:26 -06:00
Steven Silvester a6f4419da4 Update failing tests 2015-12-12 14:20:38 -06:00
Steven Silvester f8d19ae7f0 Allow 64bit integer conversions and direct downcast 2015-12-12 13:40:32 -06:00
Julius Bier Kirkegaard fb9e9e6f7a Merge pull request #2 from emmanuelle/active-contour-model
Avoids crash of active contour example when run with old scipy version
2015-12-12 15:40:51 +00:00
emmanuelle 15d09f91b8 Avoids crash of active contour example when run with old scipy version 2015-12-12 16:14:17 +01:00
Julius Bier Kirkegaard d8c7160eb2 Merge pull request #1 from emmanuelle/active-contour
Some minor PEP8 issues
2015-12-12 01:01:04 +00:00
Stefan van der Walt a8b9177ca9 Merge pull request #1812 from blink1073/matplotlib-debug
Fix matplotlib errors in test suite
2015-12-11 11:48:46 -08:00
Steven Silvester 2aab4311c1 Remove debug print 2015-12-11 10:52:00 -06:00
Steven Silvester 4b6db6425e Fix matplotlib backend
Add a debug print

Try with qtagg

Try with qt4agg

Comment out failing test for now
2015-12-11 10:49:11 -06:00
emmanuelle a16c530322 Some minor PEP8 issues 2015-12-11 17:21:17 +01:00
scottsievert 1be8336599 adds decision when to use fftconvolve/convolve2d 2015-12-10 19:47:02 -06:00
Stefan van der Walt ba361ea7fc Merge pull request #1811 from emmanuelle/sphinx
Update Sphinx requirement
2015-12-10 16:27:13 -08:00
emmanuelle 5000449970 Fixed broken sphinx link 2015-12-11 00:44:16 +01:00
emmanuelle 1455874c3c Documented required version of sphinx 2015-12-10 23:36:27 +01:00