Merge branch 'master' into devel

CHANGES.txt

@@ -1,3 +1,5 @@
+Aug 21, 2013 - v0.4.1  Fixed segfault with openjpeg 1.x when rlevel=-1
+
 Aug 18, 2013 - v0.4.0  Added append method.
 
 Aug 15, 2013 - v0.3.2  Fixed test bug where missing Pillow package caused test

docs/source/conf.py

@@ -78,7 +78,7 @@ copyright = u'2013, John Evans'
 # The short X.Y version.
 version = '0.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.0'
+release = '0.4.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/detailed_installation.rst

@@ -137,13 +137,14 @@ In addition, you must install contextlib2 and Pillow via pip. ::
 
 Windows
 -------
-32-bit WinPython 2.7.5 seems to work with OpenJPEG 1.X, 2.0, and the
+32-bit WinPython 2.7.5 seemed to work with OpenJPEG 1.X, 2.0, and the
-development version, but still requires contextlib2 and mock to be
+development version, but still required contextlib2 and mock to be
 installed via pip.   WinPython 3.3.2, however, seems to have trouble
 with OpenJPEG 2.0, so I would suggest using the development version
 there (I'm unwilling to spend ANY more time trying to figure out what
 the problem is there).
 
+At the moment I do not have access to a win32 machine, and
 64-bit windows is completely untested.
 
 

docs/source/how_do_i.rst

@@ -55,8 +55,7 @@ Consider the following XML file `data.xml` : ::
         </locality>
     </info>
 
-The **append** method can add an XML box (only XML boxes are currently
+The **append** method can add an XML box as shown below::
-allowed)::
 
     >>> import shutil
     >>> import glymur
@@ -108,8 +107,8 @@ two additional boxes (image header and color specification) contained in the
 JP2 header superbox.
 
 XML boxes are not in the minimal set of box requirements for the JP2 format, so
-in order to add an XML box into the mix, we'll need to specify all of the
+in order to add an XML box into the mix before the codestream box, we'll need to 
-boxes.  If you already have a JP2 jacket in place, you can just reuse it,
+re-specify all of the boxes.  If you already have a JP2 jacket in place, you can just reuse that,
 though.  Take the following example content in an XML file `favorites.xml` : ::
 
     <?xml version="1.0"?>
@@ -117,7 +116,8 @@ though.  Take the following example content in an XML file `favorites.xml` : ::
         <category>Light Ale</category>
     </favorite_things>
 
-and add it after the JP2 header box, but before the codestream box ::
+In order to add the XML after the JP2 header box, but before the codestream box, 
+the following will work. ::
 
     >>> boxes = jp2.box  # The box attribute is the list of JP2 boxes
     >>> xmlbox = glymur.jp2box.XMLBox(filename='favorites.xml')

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import sys
 
 kwargs = {'name': 'Glymur',
-          'version': '0.4.0',
+          'version': '0.4.1',
           'description': 'Tools for accessing JPEG2000 files',
           'long_description': open('README.md').read(),
           'author': 'John Evans',