wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-09 09:42:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,051 Commits 8 Branches 45 Tags
14852f4578da1702734311262d90d3f8c620c37c
Commit Graph

8051 Commits

This Branch
This Branch
All Branches
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
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
Charles Deledalle cc24efbe2b DOC : change sneaky unicode in the endash 2015-12-13 18:58:01 +01: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
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
François Boulogne abfa8561ab Merge branch 'master' of git://github.com/scikit-image/scikit-image 2015-12-06 16:50:48 -05: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