Commit Graph

24 Commits

Author SHA1 Message Date
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 71631bfca4 ENH: Also scan /home/stefan/lib for freeimage.so. 2011-03-15 01:23:51 +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 4760fc3dd4 BUG: Python 3 compatibility fixes by Christoph Gohlke. 2011-03-14 00:27:11 +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 7de454178b ENH: Add rgb2grey. 2010-11-05 14:59:54 +02:00
Zachary Pincus 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
Stefan van der Walt 01dca4ef5f Found shorthand for constructing dtype str (thanks, Zach!). 2010-05-14 15:54:05 +02:00
Stefan van der Walt 13199840cd In freeimage plugin, set DummyArray to writable, use correct dtype. 2010-05-14 15:11:57 +02:00
Stefan van der Walt 81b3359590 Use c_void_p to handle (*BYTE) in freeimage plugin. 2010-05-14 14:16:01 +02:00
Stefan van der Walt 0320815b9e Fix freeimage loading via array interface. 2010-05-14 13:53:11 +02:00
Stefan van der Walt 49c03eb448 Try to load both libfreeimage and libFreeImage. 2010-05-14 13:52:41 +02:00
Stefan van der Walt 9c20fd0720 In freeimage plugin, use array_interface for array construction. 2010-05-13 23:05:44 +02:00
Stefan van der Walt d082774977 Add ctypes API for freeimage plugin for use on 64-bit platforms. 2010-05-13 22:28:00 +02:00
Stefan van der Walt 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
Stefan van der Walt 0063993965 Wrap long lines in freeimage plugin. 2010-05-13 16:07:27 +02:00
Stefan van der Walt 794402bbb2 Add imread and imsave wrappers to freeimage plugin. 2010-05-13 16:04:03 +02:00
Stefan van der Walt 91ca44b3a8 Add Zachary's freeimage wrapper. Fix Ctypes loader to use NumPy. 2010-05-13 16:03:15 +02:00