From 80cb2585b164add8ac5535bc4751ab1b51e43c9c Mon Sep 17 00:00:00 2001 From: jevans Date: Thu, 5 Sep 2013 21:34:52 -0400 Subject: [PATCH] OPENJPEG_VERSION is now the version of the software, not the library. For #110 --- glymur/test/fixtures.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/glymur/test/fixtures.py b/glymur/test/fixtures.py index 4c99ade..933222a 100644 --- a/glymur/test/fixtures.py +++ b/glymur/test/fixtures.py @@ -10,10 +10,12 @@ import numpy as np import glymur -# Need to know the openjpeg version. If openjpeg is not installed, we use -# '0.0.0' +# Need to know the version of the openjpeg software. If openjpeg is not +# installed, we use # '0.0.0' OPENJPEG_VERSION = '0.0.0' -if glymur.lib.openjpeg.OPENJPEG is not None: +if glymur.lib.openjp2.OPENJP2 is not None: + OPENJPEG_VERSION = glymur.lib.openjp2.version() +elif glymur.lib.openjpeg.OPENJPEG is not None: OPENJPEG_VERSION = glymur.lib.openjpeg.version() # Need to know of the libopenjp2 version is the official 2.0.0 release and NOT