Commit Graph

105 Commits

Author SHA1 Message Date
Stefan van der Walt 84f3835106 Fix Big Endian check 2014-09-04 22:32:02 +01:00
Stefan van der Walt 051c54c577 Fix indexing bug in freeimage plugin 2014-09-04 21:29:02 +01:00
Stefan van der Walt 2b1dde202f freeimage: Correctly handle saving uint16 images (closes gh-1101) 2014-08-15 15:22:51 +02:00
Adam Feuer 8494b8081a removed trailing blank line in comment 2014-08-09 10:37:11 -07:00
Adam Feuer ef7da3be4a explicitly checking for None as per code review feedback
- instead of implicit (non-truthy) test
2014-08-09 09:04:05 -07:00
Adam Feuer 25f08ff68e removing trailing space (PEP8 formatting) 2014-08-09 09:03:06 -07:00
Adam Feuer 05380823cc updated imread parameters comment to standard format
- with 'str' file type (instead of 'string')
2014-08-09 09:01:07 -07:00
Adam Feuer 6d9a3c3913 reformat comments to be standard format
- clarified function names
- comments in standard format
- removed extra blank line
- as per code review feedback
2014-08-06 21:14:00 -07:00
Adam Feuer 1dcb60fd68 added tests for roundtrip export and import
- and corrected error in imexport - wasn't using imsave code
  correctly
- split imsave into imsave and imexport functions to reuse
  imsave code
2014-08-05 07:52:45 -07:00
Adam Feuer b03683d6c5 pil_plugin can import and export from memory
- added capability to import and export to PIL Image
  objects, not just files - allows for converting
  to and from PIL image objects without writing
  to disk
- no unit test yet
2014-08-05 07:50:09 -07:00
blink1073 b6dcf3c336 Update Travis build to use Anaconda.
Update Travis build to use Anaconda

Travis updates and fixes

More travis fixes

Another travis attempt

Revert changes

Use PIL and Pillow

Refactor travis into 4 different builds

Fix activation error

Remove explicit mpl in build_versions.py

Make matplotlib an explicit requirement

Rearrange travis

Make pillow a hard requirement

Try again to make Pillow optional

Fix bash syntax error

Fix bash syntax error

Bump required cython version

More rearrangments

Remove mpl from build_versions, rearrange travis

Fix version check

Make matplotlib explicit again

Conda install into test env

Check for proper install

Allow tests to skip if networkx is not available

Allow tests to skip if networkx is not available

Try swapping pillow for matplotlib

Allow tests to pass when matplotlib is not present

Remove matplotlib from build_versions

Print PIL version

Get pillow from PIP

Allow tests to skip if matplotlib is not present.

Allow tests to skip if networkx is not present.

travis fix

Remove unused mpl import that caused test error

Use nose-cov and do not run doctests without optional libs

Bump required numpy version and fix nose calls

Make overlay test repeatable

bump numpy version again

Move low-end numpy to python 2.7

Play with minimum versions

Add version requirements and use functions

Add version requirements and use functions

Allow require to skip a test

More implementation of require decorator

Update require decorator and clean up tests

Only use requires decorator when needed

Fix python3 error in version_requirements

Fix build errors

Fix handling of require with tests

More fixes for require handler

Use latest miniconda

Fix more build errors

Fix another dict comprehension and travis file.

Fix missing imports

Fix dictionary again

Fix import warning

Fix last failing test on 2.6

Skip doc examples on python2.6

Do not run doctests on python2.6

Fix typo in travis.yml

Make numpy-1.6 compatibility changes

Use numpy-1.6 in travis python2.6

Add tests for version requirements

Fix line noise in PR

Add additional io plugins

Fix simpleitk test.

Fix python 3 error in freeimage_plugin.

Install imread in Travis.

Put matplotlib settings in XDG recommended directory

Fix formatting in travis yml

Fix formatting in travis yml

Make sure to close PIL file atexit

Fix name of apt package xcftools

Fix pil fp closing

Fix matplotlibrc creation

Only download SimpleITK on py2x, run coverage on py27

Fix travis yml syntax error

Run coveralls on py2.7

Install SimpleITK on py3.3 and run coverage on py3.3

Make simpleitk install quiet

Use standard nose and clean up incantation

Fix travis yml syntax error

Put in miniconda workout for libc error.

Fix imread plugin.

Fix travis syntax

Remove unused import

Remove miniconda libpng in favor of system png

Fix imread install and move libm removal to after optional pkg install.

Fix png header copy in travis yml

Another attempt to use png headers

Debug freeimage

Add jpeg library for freeimage and debug imread.

More debug for imread and freeimage

More freeimage and imread debugging

More debugging

Use correct paths for test env

Make sure imread is tied to libpng15

Add a TODO note for simpleitk test causing error.

Fix typo in yml

Cleanup and add more comments to travis yml

Update comment

Try and add 3.2 support.

Docstring formatting

Add more travis comments.

Try numpy 1.6 on python 2.7

Fix travis syntax error

Rename CONDA to ENV for clarity

Alias python on python 3.2

Use python 3.2 as the system python

Clean up libfreeimage install

Fix order on py3.2 pre_install

Move old numpy back to py26

Use the appropriate python calls.

Debug 3.2 build.

Update comment

Fix syntax error

Another fix for syntax error.

Install scipy after downloading import tools

More debugging for py32

Do not install conda on py3.2 (duh)

Fix typo in travis yml

Fix py32 qt install, separate pyfits and imread to find error

Fix syntax error and front-load option lib check for debug

pyfits is not supported in py3.2, try imread now

imread is also not supported on py3.2

install imread before pyfits to show relationship with libs

Make pip builds quiet

Minor formatting to retrigger build

Allow simpleitk to fail to download without breaking the build

Use travis_retry for SimpleITK

See what breaks when we keep libm in

Now remove libm again
2014-08-02 06:47:09 -05:00
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
Thomas Robitaille 9ecbc6ef58 Use Astropy by default if possible 2014-04-22 16:39:07 +02:00
François Boulogne ba11683d45 update info about PIL 2014-04-03 19:56:02 -04:00
Stefan van der Walt b71008a135 Fix Image.frombytes for older version of Python/PIL 2014-02-12 12:59:51 +02:00
Stefan van der Walt c930133982 Use frombytes instead of fromstring on PIL images, since the latter is now deprecated 2014-02-12 12:17:26 +02:00
Tony S Yu 99aa5a8238 Move io._plugins.plugin to io.manage_plugins 2013-12-05 23:19:47 -06:00
Tony S Yu 0922ccf923 Refactor load_preferred_plugins 2013-12-05 23:19:47 -06:00
Tony S Yu ac4eb5ae7b Make preferred_plugins a dict 2013-12-05 23:19:47 -06:00
Tony S Yu 6994bc53b9 Add test for loading preferred plugins. 2013-12-05 23:19:47 -06:00
Tony S Yu f1dce4be9d Change plugin_store to use InheritedConfig 2013-12-05 23:19:46 -06:00
Tony S Yu 90f1e791d8 PEP8 2013-12-05 23:19:46 -06:00
Tony S Yu 41e62fa087 Add comment for clarification 2013-12-05 23:19:45 -06:00
Tony S Yu 8a2e88241e Factor out config-file parsing for clarity 2013-12-05 23:19:45 -06:00
Tony S Yu 312151b481 Move __init__ functions to submodules.
And rename functions so we don't have to alias imports.
2013-12-05 23:19:44 -06:00
Stefan van der Walt eb6867cfe2 Make six an external dependency. 2013-10-27 14:06:26 +02:00
Stefan van der Walt 8e763f4e48 Fix Py3 exception in GTK plugin. 2013-10-17 13:44:19 +02:00
cgohlke ea357a4464 BUG: basestring not defined on PY3 2013-10-10 21:16:14 -07:00
Adam Wisniewski 362d915399 support for saving to file-like object in imsave 2013-06-28 16:18:01 -04:00
François Boulogne 3926f1873d use items/values for python2/3 compat 2013-06-20 11:16:23 +02:00
François Boulogne 7cf20736b9 workaround for itervalues 2013-06-13 13:58:21 +02:00
Johannes Schönberger 79a5ab0e12 Merge pull request #589 from sciunto/configparser
import configparser for python3
2013-06-12 14:27:22 -07:00
François Boulogne 9042fcd85c import configparser for python3 2013-06-12 22:34:04 +02:00
Johannes Schönberger 2ac42c4619 Merge pull request #587 from sciunto/import
MIN: fix unused import
2013-06-12 13:23:28 -07:00
François Boulogne e258e05468 MIN: fix unused import 2013-06-12 21:36:28 +02:00
François Boulogne eb9de1d7eb MIN: use print() instead of print 2013-06-12 21:16:23 +02:00
Zach Pincus ab8b325ff4 Fix 64-bit multipage tiff writing segfault 2013-04-17 17:56:08 -04:00
Johannes Schönberger 21d480c32c Fix accidentially changed doc strings 2013-02-24 14:20:02 +01:00
Johannes Schönberger 62d83ad42c Globally change np to cnp if cimported 2013-02-24 14:14:14 +01:00
Matt McCormick ad23f203da ENH: Add SimpleITK IO plugin.
IO plugin for SimpleITK, http://simpleitk.org/

imread and imsave implemented. Tests based off the PIL tests.
2013-01-17 09:55:56 +00:00
Luis Pedro Coelho 10ce9b89ab RFCT Use skimage.utils.convert for type conversion 2012-11-24 19:04:16 +00:00
Luis Pedro Coelho 6ebc43bad8 ENH Add imread io plugin
This relies on imread (https://github.com/luispedro/imread) which
supports a few microscopy formats otherwise hard to read (LSM and
MetaMorph STK) as well as basic ones.
2012-11-24 19:04:01 +00:00
Paul Ivanov b4b090271d complete singularization of scikit-image
I've updated references in the code and documentation to the new name.
2012-10-08 16:29:55 -07:00
Andreas Mueller 6c59e04714 MISC remove unused imports, some pep8 corrections. 2012-09-27 20:01:45 +01:00
Tony S Yu d67e81742d DOC: Shorten plugin description so it fits in table 2012-09-02 18:10:14 -04:00
Stefan van der Walt ce423e169e Merge pull request #257 from ahojnnes/shared
ENH: Add shared package.
2012-08-25 10:35:29 -07:00
Tony S Yu 53807d79a6 Merge pull request #233 from wilsaj:image-html-repr
Conflicts:
	skimage/io/tests/test_collection.py
2012-08-24 00:15:32 -04:00
Johannes Schönberger a08779e06a Use predefined header files from Cython 2012-08-21 15:15:27 +02:00
wilsaj a31e0d9eeb remove superfluous conditional logic 2012-07-24 23:01:51 -05:00
wilsaj dcb7dacc6c open buffer on on byte_array 2012-07-21 10:23:20 -05:00