76cfe181fb
Merge Dan Farmer's Windows platform updates to the NumPy ctypes library loader.
2011-05-31 13:01:53 +02:00
0f438564c9
Remove debugging text
2011-05-20 16:11:40 -07:00
c8533488b9
Fix more indentation errors
2011-05-20 16:04:05 -07:00
59425666d0
Fix indentation error that broke linux support
2011-05-20 15:54:00 -07:00
bff3cc9e28
Modified load_library for windll
2011-05-19 22:43:33 -07:00
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
71631bfca4
ENH: Also scan /home/stefan/lib for freeimage.so.
2011-03-15 01:23:51 +02:00
eab0bd6478
BUG: Fix filename handling under Python 3.
2011-03-15 00:59:58 +02:00
082ff69549
BUG: More Python3 fixes by Christoph Gohlke.
2011-03-14 17:06:22 +02:00
4760fc3dd4
BUG: Python 3 compatibility fixes by Christoph Gohlke.
2011-03-14 00:27:11 +02:00
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
082798d5f8
DOC: Add explanation to test plugin.
2010-11-09 10:31:42 +02:00
0bf6895a49
Merge branch 'james_turner-fits_plugin'
2010-11-07 01:02:46 +02:00
fa42d5f23c
Merge branch 'imagecollection'
2010-11-07 00:51:21 +02:00
f9537e9d38
ENH: Add a free standing test for freeimage.
2010-11-05 15:05:58 +02:00
7de454178b
ENH: Add rgb2grey.
2010-11-05 14:59:54 +02:00
06f8f398bd
API: Remove dtype parameter from imread and collections. Remove as_grey from collections.
2010-11-05 14:44:01 +02:00
325b59c59a
palette support for saving 8-bit greyscale images
2010-10-22 23:33:23 +02:00
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
09268cc062
JT: more minor comments from Stefan
2010-07-03 17:44:35 -04:00
57ed210a6b
JT: various minor comments from Stefan
2010-07-03 17:05:37 -04:00
28f5b9faf7
JT: added PyFITS plugin, tests and data
2010-07-03 16:30:48 -04:00
dd5f0020ae
ENH: Add imread_collection to plugin framework.
2010-07-02 19:41:12 -05:00
cd48712329
Merge branch 'master' of git://github.com/sccolbert/scikits.image into chris
2010-06-24 17:38:49 -07:00
3c14b965d6
Allow PIL plugin to read grey-level images with alpha layer.
2010-06-08 21:25:14 -06:00
bd7a15ebaf
Add imshow to PIL plugin.
2010-06-08 21:25:14 -06:00
01dca4ef5f
Found shorthand for constructing dtype str (thanks, Zach!).
2010-05-14 15:54:05 +02:00
13199840cd
In freeimage plugin, set DummyArray to writable, use correct dtype.
2010-05-14 15:11:57 +02:00
81b3359590
Use c_void_p to handle (*BYTE) in freeimage plugin.
2010-05-14 14:16:01 +02:00
0320815b9e
Fix freeimage loading via array interface.
2010-05-14 13:53:11 +02:00
49c03eb448
Try to load both libfreeimage and libFreeImage.
2010-05-14 13:52:41 +02:00
9c20fd0720
In freeimage plugin, use array_interface for array construction.
2010-05-13 23:05:44 +02:00
d082774977
Add ctypes API for freeimage plugin for use on 64-bit platforms.
2010-05-13 22:28:00 +02:00
46d3c26a1b
In freeimage plugin, fix order of parameters to 'write'. Provide colour images to 'write' as CxMxN arrays.
2010-05-13 17:25:47 +02:00
0063993965
Wrap long lines in freeimage plugin.
2010-05-13 16:07:27 +02:00
794402bbb2
Add imread and imsave wrappers to freeimage plugin.
2010-05-13 16:04:03 +02:00
bb9ee08612
Add description file for freeimage plugin.
2010-05-13 16:03:40 +02:00
91ca44b3a8
Add Zachary's freeimage wrapper. Fix Ctypes loader to use NumPy.
2010-05-13 16:03:15 +02:00
19b5973c44
worked on prettying up scivi.
2009-12-02 20:11:49 +01:00
0011fd17c6
io: Remove unneccesary import.
2009-11-12 22:34:58 +02:00
0f604fa07e
io: Add null-plugin to simplify testing.
2009-11-12 22:34:19 +02:00
152c6209c8
finished the lut tables
2009-11-10 05:12:23 +01:00
d8709bd0c0
io: Add imsave using PIL.
2009-11-08 23:49:51 +02:00
d9f624959f
io: Throw exception when qt plugin can't be loaded.
2009-11-08 22:08:42 +02:00
c539a02b20
io: Fix one more instance of cdivision.
2009-11-08 22:02:15 +02:00
6c1bbc0297
Merge branch 'threadingio' of git://github.com/sccolbert/scikits.image into io
2009-11-08 20:30:07 +02:00
625291f361
added division decorators to cython. Improved how data gets chunked up.
2009-11-08 18:35:07 +01:00
2ac29d6fa8
Merge branch 'threadingio' of git://github.com/sccolbert/scikits.image into io
2009-11-08 11:07:57 +02:00
a6de1409e0
added try except to deal with missing multiprocessing.
2009-11-08 09:13:40 +01:00
67e0cb03ea
Merge branch 'io' of git://github.com/sccolbert/scikits.image into io
...
Conflicts:
scikits/image/io/_plugins/qt_plugin.py
2009-11-08 09:44:00 +02:00
Stefan van der Walt