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
Johannes Schönberger
21c80d2567
Test negative intensities
2014-06-18 10:57:34 -04: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
5ccbb1f38f
Merge pull request #1025 from stefanv/compat/painttool_mpl_NoNorm
...
Use more recent NoNorm API
2014-06-15 09:36:10 -04: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
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
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
Maximilian Albert
adbc2efbfa
Fix copy/paste error in docstring.
2014-05-17 18:20:10 +01: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
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
Johannes Schönberger
ac1b10d1cc
Fix docstring of skimage.filter.rank.threshold_percentile
2014-05-10 10:38:48 -04:00
Johannes Schönberger
02e6ad6b71
Test 90deg rotation for similarity transform
2014-05-10 10:22:55 -04:00
Johannes Schönberger
c3e13a9754
Test union of differing geometric transforms
2014-05-10 10:16:38 -04:00
Johannes Schönberger
7b86728498
Add full test coverage for corner_subpix and fix bug
2014-05-10 10:12:41 -04:00
Johannes Schönberger
e4a60e4bf2
Test invalid input for selem
2014-05-10 09:44:59 -04:00
Johannes Schönberger
69a0255a28
Test invalid input for seed
2014-05-10 09:07:01 -04:00
Josh Warner (Mac)
8663e23f4a
FIX: Use //= instead of /= to fix deprecation warnings in adapthist
2014-05-08 20:45:19 -05:00
Josh Warner (Mac)
8bcdfb8325
Remove unnecessary double import.
2014-05-08 20:12:31 -05:00
Stefan van der Walt
4da4ec5b89
Mention which parameters to label are optional. Simplify label deprecation.
2014-05-09 03:00:39 +02:00
Juan Nunez-Iglesias
837406c8fc
Merge pull request #1003 from JDWarner/join_dep_warning
...
FIX: Address non-int DeprecationWarning from NumPy
2014-05-09 10:58:16 +10:00
Josh Warner (Mac)
77b036eb89
Merge branch 'master' of git://github.com/scikit-image/scikit-image into int_idx_patch
2014-05-08 19:57:06 -05:00
Josh Warner (Mac)
375e406f64
Use safe_as_int for input checking.
2014-05-08 19:56:47 -05:00
Stefan van der Walt
1de102a885
Fix broken and circular imports
2014-05-09 02:53:57 +02:00
Josh Warner (Mac)
3fab7c0057
Remove incorrect np.round statement (directly cast m)
2014-05-08 18:54:52 -05:00
Johannes L. Schönberger
a4d97f2a1c
Merge pull request #992 from stefanv/warp_safe_output_shape
...
Safely handle non-integer output shape specification
2014-05-08 14:50:35 -04:00
Stefan van der Walt
e9c0cde8d4
Move safe_as_int into utils
2014-05-08 20:11:17 +02:00
Stefan van der Walt
a9dcdc3713
Use safe_as_int to check provided output shape
2014-05-08 19:28:29 +02:00
Stefan van der Walt
5ba3ea421c
Fix imports and suppress deprecation warnings
2014-05-08 19:14:38 +02:00
Stefan van der Walt
46829c6a33
Move implementation of label to measure submodule
2014-05-08 18:04:03 +02:00
Stefan van der Walt
7152d5c314
Move label to measure module (with deprecation). Warn that background parameter will default to 0 in v0.12.
2014-05-08 17:49:47 +02:00
Johannes L. Schönberger
82b404a672
Merge pull request #1004 from jni/viewer-examples
...
Viewer examples
2014-05-08 08:40:26 -04:00
Stefan van der Walt
0b6e48fe2a
Clarify regionprops output
2014-05-08 10:45:04 +02:00
Josh Warner (Mac)
26793068b1
Fix documentation, handle internal variable more efficiently.
2014-05-08 02:32:39 -05:00
Juan Nunez-Iglesias
040a3bf831
Merge pull request #1002 from JDWarner/asserttrue
...
Address PendingDeprecationWarnings in watershed tests
2014-05-08 16:26:42 +10:00
Josh Warner (Mac)
1ca0eef825
FIX: Non-integer indexing deprecation warnings
2014-05-08 00:39:54 -05:00