Commit Graph

8051 Commits

Author SHA1 Message Date
Stefan van der Walt 6926b6f9ec Update wheel URL 2014-07-02 01:06:43 +02:00
Stefan van der Walt 8e5c5d6cf4 Add OSX wheel generation instructions and upload script 2014-07-02 00:56:48 +02:00
Vighnesh Birodkar 6003ab2c7d Typos 2014-07-02 00:31:01 +05:30
Vighnesh Birodkar 99a45baca8 Changes to plot_rag.py 2014-07-02 00:21:47 +05:30
Vighnesh Birodkar 486f935db8 Rename methods and edit docstrings 2014-07-02 00:19:11 +05:30
Johannes Schönberger 600e3fd951 Merge pull request #1042 from stefanv/setup_numpy_dependence
Only import numpy after dependency check
2014-06-30 18:01:17 -04:00
Stefan van der Walt df706be6c5 Merge pull request #1039 from kdmurray91/fix_freeimage_segfault
Fix freeimage segfault with a broken/truncated JPEG
2014-06-30 15:22:29 +02:00
Kevin Murray 4160a67a42 [skimage.io.tests] add truncated jpg imread tests 2014-06-30 19:35:35 +10:00
Kevin Murray 83d0717986 [test_freeimage] Allow ValueError to be raised
With the truncated image, sometimes ValueError is raised. This allows
either RuntimeError (i.e. libfreeimage error) or ValueError to be
raised.
2014-06-30 18:47:31 +10:00
Kevin Murray 7d9f9c46d9 [test_freeimage.py] remove extraneous statements 2014-06-30 14:45:51 +10:00
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
Vighnesh Birodkar 6abf194dd6 Use sets instead of dictionaries in merge_nodes 2014-06-28 21:02:25 +05:30
Vighnesh Birodkar dd67b3fce7 Changed max_edge in example/plot_rag.py 2014-06-28 11:06:30 +05:30
Vighnesh Birodkar f71ad51f57 Got Py3 test to pass 2014-06-28 10:35:14 +05:30
François Boulogne 79d698ee11 add user guide parallelization 2014-06-27 21:40:37 -04:00
Stefan van der Walt 992a12f968 Only import numpy after dependency check 2014-06-27 23:37:28 +02:00
Vighnesh Birodkar 87465d91d7 test_rag.py formatting 2014-06-28 01:39:28 +05:30
Vighnesh Birodkar e63ae9450a merge_nodes docstring change 2014-06-28 01:35:41 +05:30
Vighnesh Birodkar 1982a3246c Docstring changes. 2014-06-28 01:32:55 +05:30
Vighnesh Birodkar c8480d3f6d Change merge_nodes code and test case 2014-06-28 01:17:44 +05:30
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
Vighnesh Birodkar c08a6876d6 Added comment about footprint 2014-06-26 02:05:20 +05:30
Vighnesh Birodkar f481724f35 Added RAG merge example 2014-06-26 02:02:33 +05:30
Vighnesh Birodkar bb874074c4 None comparison 2014-06-26 00:58:54 +05:30
Vighnesh Birodkar b1284ee180 update test for py3 2014-06-26 00:57:50 +05:30
Vighnesh Birodkar cbfa8aa6e1 docstring corrections 2014-06-26 00:54:16 +05:30
Vighnesh Birodkar b1f59fceee Changed prototype of weight_func 2014-06-26 00:11:49 +05:30
Vighnesh Birodkar bd9ab8f0fd Switch label_image to labels 2014-06-23 23:04:16 +05:30
Vighnesh Birodkar 27831d8e2f Formatting and docstring changes 2014-06-23 22:26:53 +05:30
Vighnesh Birodkar 66d3ec3831 removed commented stataments 2014-06-23 01:28:10 +05:30
Vighnesh Birodkar c14021a9cb Formatting and typos 2014-06-23 01:16:57 +05:30
Vighnesh Birodkar a1bc2e95fd Made test Python3 compatible 2014-06-23 01:15:00 +05:30
Vighnesh Birodkar 0efca40747 Added connectivity parameter and a function input to merge_nodes 2014-06-23 00:58:13 +05:30
Vighnesh Birodkar 3db0a2f81f Naming changes and formatting 2014-06-22 20:27:44 +05:30
Vighnesh Birodkar 319530fb89 Used mapping in graph_cut.py 2014-06-22 19:48:52 +05:30
Vighnesh Birodkar 0e35c422b3 Graph can now merge non adjacent nodes 2014-06-22 13:58:00 +05:30
Vighnesh Birodkar 711de464e5 Formatting changes 2014-06-19 18:03:44 +05:30
Vighnesh Birodkar 76d3dbad57 added merge_nodes test 2014-06-19 17:57:07 +05:30
Vighnesh Birodkar d0e7a26f6f Added RAG merge_nodes test case 2014-06-19 16:36:17 +05:30
Vighnesh Birodkar 20cefcf50a Added comments and switched try with if 2014-06-19 16:18:53 +05:30
Vighnesh Birodkar 8a36040eb8 rebased and used color.label2rgb 2014-06-19 02:54:20 +05:30
Vighnesh Birodkar 410aecb354 type casting to double instead of long 2014-06-19 02:50:25 +05:30
Vighnesh Birodkar 53330496f8 Added references 2014-06-19 02:50:25 +05:30
Vighnesh Birodkar 78397bf54d reverted benfo.info and setup.py 2014-06-19 02:50:25 +05:30
Vighnesh Birodkar 9b8e1333e8 Corrected rag import 2014-06-19 02:50:25 +05:30
Vighnesh Birodkar f5f93f8ce3 Removed cython file and added nd python function for RAG construction 2014-06-19 02:50:25 +05:30
Vighnesh Birodkar 2a7ec3afd4 Renamed _construct.pyx to _build_rag.pyx and some code corrections 2014-06-19 02:50:25 +05:30
Vighnesh Birodkar 53318c44df CHanges to get Python3 working 2014-06-19 02:50:25 +05:30
Vighnesh Birodkar 5165ebe01e Added networkx installation 2014-06-19 02:50:25 +05:30
Vighnesh Birodkar dfee068550 Added networkx to requirements 2014-06-19 02:50:25 +05:30