Commit Graph

28 Commits

Author SHA1 Message Date
Josh Warner cbc851bba6 FIX/STY: Remove magic and enforce PEP8 in plugins. 2015-08-13 19:47:00 -05:00
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
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
Zach Pincus ab8b325ff4 Fix 64-bit multipage tiff writing segfault 2013-04-17 17:56:08 -04:00
Matt McCormick 74554793ad STY: Align multi-line string statements. 2012-07-20 16:00:06 -04:00
Matt McCormick db4cc04a90 BUG: Fix tests when FreeImage is not installed.
The plugin loader tries plugins but only catches ImportError and
RuntimeError.  The FreeImage plugin was throwing OSError.  Tests
were failing when FreeImage was not installed.  It now throws a
RuntimeError.
2012-07-20 15:46:58 -04:00
cgohlke 8d313f1d57 Fix io.imsave() problems with passing arguments to plugin "freeimage" 2012-07-12 10:34:15 -07:00
Andreas Mueller d7f1a3abec COSMIT minor stype improvements, whitespace in error messages 2012-06-29 11:27:23 +02:00
Andreas Mueller f7b3d8062c COSMIT pep8 2012-06-29 11:27:23 +02:00
Stefan van der Walt 34505fef46 BUG: Fix FreeImage Py3k compatibility [patch by Almar Klein]. 2012-05-21 18:24:32 -07:00
cgohlke 4e87a1dfce Add new 64-bit metadata types to METADATA_DATATYPE (new in FreeImage 3.15.3) 2012-05-19 13:23:32 -07:00
cgohlke 161e42e053 Fix conversion of bytes to str on Python 3 2012-02-25 20:33:17 -08:00
Stefan van der Walt b127f60533 STY: Whitespace cleanup. 2012-02-10 15:36:11 -08:00
Zach Pincus f2321d0441 STY: Clarify logic of code for FreeImage loading. 2012-02-10 15:36:11 -08:00
Zach Pincus 6a31ea8508 BUG: Make it work actually... 2012-02-10 15:36:11 -08:00
Zach Pincus 99ac9e44ff ENH: load libfreeimage based on case-insensitive libname prefixes 2012-02-10 15:36:11 -08:00
Stefan van der Walt 5c5de01523 STY: Whitespace cleanup freeimage patch. 2012-02-02 16:56:54 -08:00
Zach Pincus 12e67e781e ENH: Clarify FreeImage IO flags, improve tests, and fix documentation 2012-02-02 11:05:27 -05:00
Zach Pincus a4c986b02f DOC: Fix read_multipage docstring 2012-02-01 22:57:44 -05:00
Zach Pincus b5dce45446 ENH: Add metadata reading functions
Required small refactoring of file IO to provide a saner interface.
2012-02-01 22:48:01 -05:00
zachrahan 3a1641f799 Merge pull request #117 from zachrahan/freeimage-library_loader
ENH: Make FreeImage library-loading more robust and provide better errors
2012-02-01 10:43:44 -08:00
Zach Pincus 960ca18b71 Fix indentation error 2012-02-01 13:41:41 -05:00
Zach Pincus 273e8ffc04 Make library-loading more robust and provide better errors 2012-01-31 15:04:31 -05:00
Zach Pincus 981775d137 Clean up void-pointer handling to clarify intent and fix multipage 64-bit bugs 2012-01-22 18:34:28 -05:00
Nelle Varoquaux 114cf44c77 Renamed scikits.image to skimage 2011-10-18 21:12:27 +02:00