 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 |
|
|
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 |
|
|
Kevin Keraudren
|
0bdf4251c6
|
documentation updates; added "3D" to example title
|
2015-12-04 22:25:13 +00:00 |
|
|
Guillaume Lemaitre
|
0c1fc76f4b
|
Update the reference
|
2015-12-04 19:27:44 +01:00 |
|
|
Guillaume Lemaitre
|
54043de4b4
|
Change the import of round function to be compatible with visual studio compiler
|
2015-12-04 19:26:38 +01:00 |
|
|
Guillaume Lemaitre
|
3a2acb2adf
|
Update the documentation with spelling error
|
2015-12-04 19:26:37 +01:00 |
|
|
Guillaume Lemaitre
|
4bc1c587ed
|
Add local geometric mean filter
Add the filter in cython with a specific kernnel.
The implementatio is based on the log-average method.
The test were added the npz.
|
2015-12-04 19:26:37 +01:00 |
|
|
Johannes Schönberger
|
0e38481ade
|
Improvements to entropy example
|
2015-12-04 12:45:15 -05:00 |
|
|
Johannes Schönberger
|
bc7e9588e9
|
Merge pull request #1676 from odebeir/sprint_add_entropy_example
add entropy example
|
2015-12-04 11:37:47 -05:00 |
|
|
Korijn van Golen
|
c095daa234
|
Added unit test to check correct output of HOG on Lena grayscale image, and added feature_vector parameter to disable the .ravel() call on the result.
|
2015-12-04 10:42:12 +01:00 |
|
|
ivoflipse
|
2adab1560a
|
Reapplying the changes that got reverted
|
2015-12-04 10:42:11 +01:00 |
|
|
ivoflipse
|
9048a20340
|
Fix an error in the centre calculation
|
2015-12-04 10:42:10 +01:00 |
|
|
ivoflipse
|
8b7920ea13
|
Fix an error in the centre calculation
|
2015-12-04 10:42:09 +01:00 |
|
|
ivoflipse
|
c1722d8709
|
Moved range_rows_start/stop and range_colums_start/stop to hog_histograms
Divided the total by the size of the cell to normalize the result in cell_hog
|
2015-12-04 10:42:09 +01:00 |
|
|
Kevin Keraudren
|
6f9a55c987
|
added deprecation warning for LineModel and added note in TODO.txt
|
2015-12-04 08:48:08 +00:00 |
|