Commit Graph

7670 Commits

Author SHA1 Message Date
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
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 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
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
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
Juan Nunez-Iglesias 966e0fd685 Merge pull request #1770 from stefanv/list_regionprops
Only iterate over available region properties
2015-12-09 11:21:56 +11:00
Juan Nunez-Iglesias 1a05b130e8 Merge pull request #1449 from stefanv/clear_border_non_binary
Allow clear_border to operate on labeled images
2015-12-09 11:18:40 +11:00
Stefan van der Walt c133d5fd59 Merge pull request #1803 from JDWarner/mesh_orientation_cleanup
Guarantee correct mesh orientation from marching cubes
2015-12-07 20:13:58 -08:00
Stefan van der Walt 4eb4dcd52b Merge pull request #1805 from jni/fix_slic
Allow every pixel to be a different superpixel in SLIC
2015-12-07 20:12:52 -08:00
Josh Warner (Mac) 443f4cc0eb DOC: Correct docstring to correctly reflect defaults 2015-12-07 21:12:17 -07:00
emmanuelle bff2ce0bc4 Missing line 2015-12-08 12:27:24 +11:00
emmanuelle bb64e8cfcb Added test for slic segmentation: case where more segments than pixels
are asked for.
2015-12-08 12:27:24 +11:00
Gael Varoquaux 12c173908f BUX: in _slic.pyx slice can has steps=None
int(None) fails, and slice.steps == None is valid. It is equivalent to 1.
2015-12-08 12:27:24 +11:00
Josh Warner 29725068ce Guarantee correct mesh orientation from marching cubes 2015-12-06 00:28:18 -06:00
Josh Warner 6f016c9087 Merge pull request #1771 from noahtreb/fix-correct_mesh_orientation
FIX: Fix `correct_mesh_orientation` for spacing != (1,1,1)
2015-12-05 12:22:18 -06:00
Josh Warner 8c08a4d468 Merge pull request #1798 from kevin-keraudren/seamcarving-typos
DOC: Fix typos in seam carving example
2015-12-05 11:49:53 -06:00
Josh Warner f25b46c9bb Merge pull request #1799 from ahojnnes/linemodelnd
FIX: Fix LineModelND test cases and linalg.norm axis error
2015-12-05 11:48:26 -06:00
Josh Warner e72908c6d9 Merge pull request #1800 from blink1073/fix-docs
DOC: Fix errant docstring reference
2015-12-05 11:29:42 -06:00
Steven Silvester 219d08ad7b Fix errant docstring 2015-12-05 10:35:11 -06:00
Kevin Keraudren 817b090c7c text improvement in seam carving example, added some newlines between plt.imshow() and """PLOT2RST""" 2015-12-05 14:23:23 +00:00
Johannes Schönberger 50f2a0b4ed Create helper function to compute norm along axis 2015-12-04 23:11:19 -05:00
Johannes Schönberger f88694e5a3 Fix LineModelND test cases 2015-12-04 23:05:59 -05:00
Kevin Keraudren bed6f6069b small text improvement in seam carving example 2015-12-05 00:05:18 +00:00
Kevin Keraudren a0c5270e94 text improvement in seam carving example. 2015-12-04 23:54:52 +00:00
Kevin Keraudren e6c60ca890 fixed typos in seam carving example. 2015-12-04 23:10:53 +00:00
Josh Warner 07f18c6067 Merge pull request #1797 from ahojnnes/entr-ex
DOC: Improvements to entropy example
2015-12-04 17:09:12 -06:00
Johannes Schönberger 198ce0250b Merge pull request #1764 from glemaitre/geometric_mean
Geometric mean
2015-12-04 18:02:44 -05:00
Johannes Schönberger a1d162a4f9 Use more common syntax to assign axis variables 2015-12-04 18:00:38 -05:00
Johannes Schönberger 99484e3a77 Merge pull request #1795 from kevin-keraudren/ransac-linemodel3D
Adding LineModel3D for RANSAC, unit test and example.
2015-12-04 17:58:52 -05:00