Commit Graph
171 Commits
Author SHA1 Message Date
Emmanuelle Gouillart 805be0ab3f Name of new github repository in setup.py of submodules 2011-08-29 20:55:00 +02:00
Stefan van der Walt fa422d5084 Correctly detect missing FreeImage. 2011-08-24 03:54:22 -07:00
Neil a595f267fd Remove as_grey from plugins 2011-07-17 00:21:43 +02:00
Neil 435a2dab55 Revert "Pass as_grey to the imread plugins"
This reverts commit 8f16ca1242, as the
as_grey keyword should disappear from the plugins.
2011-07-17 00:14:09 +02:00
Neil b5c85b6eb8 Don't rely on pil for plugin_priority test. Skip test if neither pil or freeimage are available 2011-07-16 23:01:42 +02:00
Neil e7a69bbfc5 Skip pil_plugin tests if PIL isn't available 2011-07-16 22:14:00 +02:00
Neil 8f16ca1242 Pass as_grey to the imread plugins 2011-07-16 21:55:57 +02:00
Neil 8ceb250bee Return correct type for as_grey with freeimage 2011-07-16 21:53:30 +02:00
Neil 26402a7e67 Replace old raise form 2011-07-16 19:01:15 +02:00
Neil 1a48914811 Remove temporary files 2011-07-16 19:01:15 +02:00
Neil 2409bbce9f Only call MultiImage if PIL is available to ensure nose handles this case properly 2011-07-16 19:01:15 +02:00
Neil f64ddb1fd1 replace TemporaryFile with NamedTemporaryFile, for compatability with later python versions 2011-07-16 19:01:15 +02:00
Neil 12c1829b78 Fix logic error in _load_library 2011-07-16 19:01:15 +02:00
Neil fc17f50d8b Rework exception handling logic in freeimage_plugin.py 2011-07-16 19:01:15 +02:00
Neil d061967cdb Convert from CRLF line endings 2011-07-16 19:01:15 +02:00
Neil 319081d874 Remove outdated reference to 'load_plugins' 2011-07-16 19:01:15 +02:00
Stefan van der Walt b32bd12e16 Allow test_sift to be ran independently. 2011-07-10 14:03:07 -07:00
Stefan van der Walt 76cfe181fb Merge Dan Farmer's Windows platform updates to the NumPy ctypes library loader. 2011-05-31 13:01:53 +02:00
Dan Farmer 0f438564c9 Remove debugging text 2011-05-20 16:11:40 -07:00
Dan Farmer c8533488b9 Fix more indentation errors 2011-05-20 16:04:05 -07:00
Dan Farmer 59425666d0 Fix indentation error that broke linux support 2011-05-20 15:54:00 -07:00
Dan Farmer bff3cc9e28 Modified load_library for windll 2011-05-19 22:43:33 -07:00
Zach Pincus c2664f087e Fixed (?) segfaults on 64-bit platforms
This bug was caused by the fact that ctypes silently converts returned
c_void_p instances into python int values, even if the restype of a function
is c_void_p. Then, without explicit argtypes (which this module doesn't use,
out of laziness on my part), python ints passed to functions are treated as
32-bit ints.

Solution: explicitly wrap returned pointers as c_void_p, so that they'll get
treated right when passed back to C. No more segfaults!

I also reverted the _wrap_bitmap_bits_in_array code to what I wrote, as I
can vouch for that on 64-bit, whereas the other version had a "still crashes"
note...
2011-05-09 11:52:35 -04:00
Stefan van der Walt 8d74f9cc5f BUG: Import PIL.Image correctly. Skip tests if not available. 2011-04-11 08:53:26 +02:00
Stefan van der Walt 71631bfca4 ENH: Also scan /home/stefan/lib for freeimage.so. 2011-03-15 01:23:51 +02:00
Stefan van der Walt 0fb8156760 BUG: Do not rely on PIL by default. 2011-03-15 01:16:03 +02:00
Stefan van der Walt eab0bd6478 BUG: Fix filename handling under Python 3. 2011-03-15 00:59:58 +02:00
Stefan van der Walt 694fe204cd BUG: Do not break on import if PIL isn't available. 2011-03-14 17:09:05 +02:00
Stefan van der Walt 082ff69549 BUG: More Python3 fixes by Christoph Gohlke. 2011-03-14 17:06:22 +02:00
Stefan van der Walt 4760fc3dd4 BUG: Python 3 compatibility fixes by Christoph Gohlke. 2011-03-14 00:27:11 +02:00
Stefan van der Walt e45b6e0129 BUG: Fix building under Python 3. 2011-03-13 17:13:02 +02:00
Luis Pedro Coelho ff02f4ce9d BUG: Correctly handle images with an alpha channel
Bug caught by Zachary Pincus on scipy-user.
2010-11-12 09:45:26 -05:00
Stefan van der Walt 082798d5f8 DOC: Add explanation to test plugin. 2010-11-09 10:31:42 +02:00
Stefan van der Walt 23a4d3d914 BUG: PIL tests should set plugin at setup. 2010-11-07 01:29:10 +02:00
Stefan van der Walt 0bf6895a49 Merge branch 'james_turner-fits_plugin' 2010-11-07 01:02:46 +02:00
Stefan van der Walt fa42d5f23c Merge branch 'imagecollection' 2010-11-07 00:51:21 +02:00
Stefan van der Walt f9537e9d38 ENH: Add a free standing test for freeimage. 2010-11-05 15:05:58 +02:00
Stefan van der Walt 7de454178b ENH: Add rgb2grey. 2010-11-05 14:59:54 +02:00
Stefan van der Walt 06f8f398bd API: Remove dtype parameter from imread and collections. Remove as_grey from collections. 2010-11-05 14:44:01 +02:00
Zachary PincusandStefan van der Walt 325b59c59a palette support for saving 8-bit greyscale images 2010-10-22 23:33:23 +02:00
Luis Pedro Coelho 30b4ff2274 Fix freeimage_plugin.imsave
Previously, the plugin perfomed a copy of the bitmap's pixel memory
instead of mapping into a ndarray. This fixes it. Also, it saved images
rotated by 90 degrees as it didn't convert to freeimage's internal
format.

Copying less also makes imread visibly faster.
2010-08-23 12:15:01 -04:00
James Turner ff55f6f06b JT: fix an import when pyfits is missing 2010-07-03 17:48:11 -04:00
James Turner 09268cc062 JT: more minor comments from Stefan 2010-07-03 17:44:35 -04:00
James Turner 57ed210a6b JT: various minor comments from Stefan 2010-07-03 17:05:37 -04:00
James Turner 28f5b9faf7 JT: added PyFITS plugin, tests and data 2010-07-03 16:30:48 -04:00
Stefan van der Walt dd5f0020ae ENH: Add imread_collection to plugin framework. 2010-07-02 19:41:12 -05:00
Stefan van der Walt b8cb9ff9c8 ENH: Refactor ImageCollection to allow more general file loading schemes. 2010-07-02 17:51:50 -05:00
Stefan van der Walt cd48712329 Merge branch 'master' of git://github.com/sccolbert/scikits.image into chris 2010-06-24 17:38:49 -07:00
Stefan van der Walt 7c1c951972 More accurate docstring for imread. 2010-06-09 00:51:55 -06:00
Stefan van der Walt 3c14b965d6 Allow PIL plugin to read grey-level images with alpha layer. 2010-06-08 21:25:14 -06:00