Kevin Murray
d69cdb951b
[freeimage tests] Add a test w/ truncated image
...
This tests tests the fix in the previous commit b9a7445 , covering the
issue noted in issue #1037 .
2014-06-30 14:45:51 +10:00
Kevin Murray
b9a7445296
[skimg.io._plugins.freeimage_plugin] fix segfault
...
I have moved the freeimage error handler callback function to the module
namespace to prevent it being garbage collected. See the following for
more info on this quirk of ctypes:
http://stackoverflow.com/questions/12995925/how-to-prevent-functype-from-being-collected
https://github.com/JohannesBuchner/PyMultiNest/issues/5
This also changes the way FreeImage errors are handled. If an exception
is raised in a callback, it will not propagate beyond ctypes internals.
Now, we use a callback that sets a global variable to indicate error. We
then check for error and reset the error string to NULL every time the
C api is called. This is the only way we can both:
a) Not segfault on freeimage error
b) Pass the freeimage error to the user
c) raise RuntimeError()
2014-06-27 21:26:58 +10:00
Juan Nunez-Iglesias
b85fb74bf1
Merge pull request #1034 from ahojnnes/label-coverage
...
Test negative intensities in label2rgb
2014-06-19 01:57:48 +10:00
Johannes Schönberger
21c80d2567
Test negative intensities
2014-06-18 10:57:34 -04:00
Stefan van der Walt
57b9e67b31
Merge pull request #1033 from jni/label_image
...
Add "average segment color" method for `label2rgb`
2014-06-18 11:49:24 +02:00
Juan Nunez-Iglesias
fdc848b6a7
Add tests for label2rgb avg mode
2014-06-18 17:03:34 +10:00
Juan Nunez-Iglesias
b494e36223
Add docstring for _label2rgb_overlay
2014-06-18 17:03:21 +10:00
Juan Nunez-Iglesias
b70d423aab
Add default values for background in _label2rgb_avg
2014-06-18 16:46:51 +10:00
Juan Nunez-Iglesias
d72163a037
Add docstring for _label2rgb_avg
2014-06-18 16:46:15 +10:00
Juan Nunez-Iglesias
7cc40ddbff
Add background label handling for label2rgb_avg
2014-06-18 16:44:02 +10:00
Juan Nunez-Iglesias
a1fd895c4a
Split label2rgb into two related functions
2014-06-17 17:45:15 +10:00
Juan Nunez-Iglesias
1eae917af3
Update label2rgb doc
2014-06-17 17:00:42 +10:00
Johannes Schönberger
df7a7eeb6b
Merge pull request #1024 from stefanv/bugs/qt_pyside_matplotlib_compat
...
Use same import order as matplotlib for PySide/PyQT
2014-06-15 22:20:56 -04:00
Stefan van der Walt
00009fe962
Use same order as matplotlib for PySize/PyQT
2014-06-15 23:47:16 +02:00
Johannes Schönberger
fea4c1723a
Merge pull request #1028 from stefanv/viewer/median_filter
...
Fix median filter viewer example
2014-06-15 09:48:34 -04:00
Johannes Schönberger
f054f315c1
Merge pull request #1027 from stefanv/maint/ignore_generated_notebooks
...
Ignore auto-generated notebooks in Git
2014-06-15 09:36:51 -04:00
Johannes Schönberger
5ccbb1f38f
Merge pull request #1025 from stefanv/compat/painttool_mpl_NoNorm
...
Use more recent NoNorm API
2014-06-15 09:36:10 -04:00
Johannes Schönberger
c70a1c71e6
Merge pull request #1026 from stefanv/bugs/watershed_none_comparison
...
Correctly compare mask to None
2014-06-15 09:35:52 -04:00
Stefan van der Walt
39bf45a9f3
Fix median filter example
2014-06-15 15:23:40 +02:00
Stefan van der Walt
56f66fb8b3
Ignore auto-generated notebooks in Git
2014-06-15 15:07:22 +02:00
Stefan van der Walt
dead8612c7
Correctly compare mask to None
2014-06-15 15:04:40 +02:00
Stefan van der Walt
9446f6b71a
Use more recent NoNorm API
2014-06-15 15:03:46 +02:00
Johannes Schönberger
9fd8bb09a3
Merge pull request #1022 from jni/medial_axis
...
Clarify `mask` argument in `medial_axis` docstring
2014-06-11 13:14:40 -04:00
Juan Nunez-Iglesias
34cf1f9243
Update parameter list in docstring for consistency
2014-06-12 01:20:53 +10:00
Juan Nunez-Iglesias
8cba840a05
Clarify mask argument in medial_axis docstring
2014-06-11 20:29:06 +10:00
Josh Warner
3814df2f79
Merge pull request #1019 from stefanv/build/extra_files
...
Update MANIFEST to include all test data
2014-06-02 09:13:52 -05:00
Stefan van der Walt
ba55d3259b
Update MANIFEST to include all test data
2014-06-02 12:41:39 +02:00
Johannes Schönberger
108b91672c
Merge pull request #1016 from stefanv/doc/depends
...
Fix markup in DEPENDS
2014-06-01 08:19:54 -04:00
Stefan van der Walt
8fcbc7615f
Fix markup in DEPENDS
2014-06-01 12:38:57 +02:00
Johannes Schönberger
9b0b9c13d0
Count number of commits
2014-05-27 22:39:22 -04:00
Johannes Schönberger
7d50cb7926
Remove deprecated release instruction
2014-05-27 21:59:25 -04:00
Johannes Schönberger
c026b21a66
Increase version to 0.11dev
2014-05-27 21:46:41 -04:00
Johannes Schönberger
fb4729d60d
Fix gh-pages build script
2014-05-27 21:46:41 -04:00
Johannes Schönberger
ea6c9b27ab
Update release instructions for building docs
2014-05-27 21:46:41 -04:00
Johannes Schönberger
2171f94048
Change to http git protocol
2014-05-27 21:46:41 -04:00
Johannes Schönberger
a421953d81
Add 0.10 to docs
2014-05-27 21:46:41 -04:00
Johannes Schönberger
24be78e433
Set version 0.10
2014-05-27 21:46:41 -04:00
Johannes Schönberger
a06956430d
Move removal of deprated functionality by one version
2014-05-27 21:46:41 -04:00
Johannes L. Schönberger
6546b9dba4
Merge pull request #1007 from stefanv/label_refactor
...
Move `morphology.label` to `measure.label` and prepare for 0-label transition
2014-05-25 21:56:42 -04:00
Stefan van der Walt
c0be2ec505
Correctly apply catch_warnings()
2014-05-26 01:21:58 +02:00
Stefan van der Walt
135965fbe4
Avoid circular imports
2014-05-25 20:05:17 +02:00
Stefan van der Walt
e50d1b801f
Merge pull request #1015 from maxalbert/master
...
Fix copy/paste error in `lab2rgb`
2014-05-17 19:26:17 +02:00
Maximilian Albert
adbc2efbfa
Fix copy/paste error in docstring.
2014-05-17 18:20:10 +01:00
Stefan van der Walt
98c426d583
Merge pull request #1014 from tonysyu/update-EPD-link
...
Change EPD link to Enthought Canopy
2014-05-15 17:33:58 +02:00
Tony S Yu
a2d2a73f7d
Change EPD link to Enthought Canopy
2014-05-15 10:31:15 -05:00
Stefan van der Walt
5b07567973
Merge pull request #1005 from JDWarner/int_idx_patch
...
Fix NumPy non-integer indexing deprecation warnings
2014-05-13 17:48:11 +02:00
Stefan van der Walt
aff717f8de
Merge pull request #1008 from ahojnnes/coverage
...
Improve coverage and docstrings for subpixel corner detection
2014-05-12 23:17:50 +02:00
Johannes Schönberger
da2ddb6123
Improve description of subpixel corner localization
2014-05-12 14:42:50 -04:00
Johannes Schönberger
7ec58dcaed
Comment special case when local patch around is constant
2014-05-11 18:21:09 -04:00
Johannes Schönberger
e8ab5559d5
Test invalid input for unwrap_phase
2014-05-10 10:47:52 -04:00