Merge branch 'devel' of github.com:quintusdias/glymur into devel

This commit is contained in:
John Evans 2013-10-01 11:00:52 -04:00
commit 7d816ffb21

View file

@ -13,7 +13,7 @@ both read and write JPEG 2000 files, but you may wish to install version 2.0
or the 2.0+ version from OpenJPEG's development trunk for better performance. or the 2.0+ version from OpenJPEG's development trunk for better performance.
If you do that, you should compile it as a shared library (named *openjp2* If you do that, you should compile it as a shared library (named *openjp2*
instead of *openjpeg*) from the developmental source that you can retrieve instead of *openjpeg*) from the developmental source that you can retrieve
via subversion. As of this time of writing, svn revision 2345 works. via subversion. As of this time of writing, svn revision 2347 works.
You should also download the test data for the purpose of configuring You should also download the test data for the purpose of configuring
and running OpenJPEG's test suite, check their instructions for all this. and running OpenJPEG's test suite, check their instructions for all this.
You should set the **OPJ_DATA_ROOT** environment variable for the purpose You should set the **OPJ_DATA_ROOT** environment variable for the purpose
@ -25,9 +25,10 @@ of running Glymur's test suite. ::
Glymur uses ctypes to access the openjp2/openjpeg libraries, Glymur uses ctypes to access the openjp2/openjpeg libraries,
and because ctypes accesses libraries in a platform-dependent manner, it is and because ctypes accesses libraries in a platform-dependent manner, it is
recommended that you create a configuration file to help Glymur properly find recommended that you create a configuration file to help Glymur properly find
the openjpeg or openjp2 libraries (linux users don't need to bother if you are the openjpeg or openjp2 libraries (linux users don't need to bother with this
using OpenJPEG as provided by your package manager). The configuration if you are using OpenJPEG as provided by your package manager). The
format is the same as used by Python's configparser module, i.e. :: configuration format is the same as used by Python's configparser module,
i.e. ::
[library] [library]
openjp2: /opt/openjp2-svn/lib/libopenjp2.so openjp2: /opt/openjp2-svn/lib/libopenjp2.so