Commit Graph
193 Commits
Author SHA1 Message Date
Stefan van der Walt d22da55cdc BUG: Untabify video.py. 2011-10-10 13:01:23 -07:00
Riaan van den Dool 022aac779f GDAL plugin added. 2011-10-10 11:52:07 +02:00
Stefan van der Walt b41398d83a Merge video I/O. 2011-10-09 16:20:56 -07:00
Stefan van der Walt 744b8d7668 Qt-based image reading.
Conflicts:
	scikits/image/io/__init__.py
2011-10-09 16:14:21 -07:00
Stefan van der Walt 131a361b60 Merge pull request #10 from holtzhau/video-io
Video I/O.
2011-10-09 16:06:15 -07:00
andyandStefan van der Walt fc612a830e pep8 2011-10-04 11:56:23 -07:00
andyandStefan van der Walt 7448ba2529 null_plugin gets imread as promised in __ini__.py of plugins 2011-10-04 11:56:17 -07:00
andyandStefan van der Walt 79cde8df47 have preferrence list of plugins instead of just trying "null" and "pil" 2011-10-04 11:56:11 -07:00
Neil c53c8f3e00 Fix axes color order 2011-10-01 13:57:09 +02:00
Neil 5d2573af85 Remove as_grey from qt imread 2011-10-01 13:57:09 +02:00
Neil c266290b5d Don't return an alpha channel if it's not present. Fix return type of as_grey 2011-10-01 13:57:09 +02:00
Neil f260a47573 Try initialise multiple plugins, not just PIL 2011-10-01 13:57:09 +02:00
Neil 9b696cf34e Only enable imread for new enough sip versions. Warn user if sip is too old 2011-10-01 13:57:09 +02:00
Neil 47fba11c98 Add qt-based imread function 2011-10-01 13:57:09 +02:00
Neil 3f12aef7ed Fix bug with 2D images 2011-10-01 13:57:08 +02:00
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
Pieter Holtzhausen c1c5be1b61 Docstring optional 2011-08-22 14:02:01 +02:00
Pieter Holtzhausen c9ec1afea0 Docstring mods 2011-08-22 13:59:43 +02:00
Pieter Holtzhausen 2425209075 get_collection method interfacing ImageCollection 2011-08-22 13:53:01 +02:00
Pieter Holtzhausen 03c68121f6 Created Video base class and handle backend import errors. 2011-08-19 01:27:43 +02:00
Pieter Holtzhausen 9b55c5d9f6 Added video duration routines 2011-07-18 17:23:02 +02:00
Pieter Holtzhausen 5d8210c29c Seeking in video 2011-07-18 16:11:15 +02:00
Pieter Holtzhausen 050f83bb23 GStreamer and opencv player versions. 2011-07-17 17:45:17 +02: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