Glymur 0.12.9.post1__py3-none-any.whl → 0.13.0__py3-none-any.whl

glymur/lib/openjp2.py

@@ -5,6 +5,7 @@
 import ctypes
 import queue
 import textwrap
+import warnings
 
 # 3rd party library imports
 import numpy as np
@@ -1495,3 +1496,32 @@ def write_tile(codec, tile_index, data, *pargs):
 def set_error_message(msg):
     """The openjpeg error handler has recorded an error message."""
     ERROR_MSG_LST.put(msg)
+
+
+# Setup the default callback handlers.  See the callback functions subsection
+# in the ctypes section of the Python documentation for a solid explanation of
+# what's going on here.
+_CMPFUNC = ctypes.CFUNCTYPE(ctypes.c_void_p, ctypes.c_char_p, ctypes.c_void_p)
+
+
+def _default_error_handler(msg, _):
+    """Default error handler callback for libopenjp2."""
+    msg = "OpenJPEG library error:  {0}".format(msg.decode('utf-8').rstrip())
+    set_error_message(msg)
+
+
+def _default_info_handler(msg, _):
+    """Default info handler callback."""
+    print("[INFO] {0}".format(msg.decode('utf-8').rstrip()))
+
+
+def _default_warning_handler(library_msg, _):
+    """Default warning handler callback."""
+    library_msg = library_msg.decode('utf-8').rstrip()
+    msg = "OpenJPEG library warning:  {0}".format(library_msg)
+    warnings.warn(msg, UserWarning)
+
+
+_ERROR_CALLBACK = _CMPFUNC(_default_error_handler)
+_INFO_CALLBACK = _CMPFUNC(_default_info_handler)
+_WARNING_CALLBACK = _CMPFUNC(_default_warning_handler)

glymur/tiff.py

@@ -697,9 +697,14 @@ class Tiff2Jp2k(object):
             self.tw = self.imagewidth
             self.rps = self.get_tag_value(278)
 
+        if self.spp == 1:
+            shape = (self.imageheight, self.imagewidth)
+        else:
+            shape = (self.imageheight, self.imagewidth, self.spp)
+
         self.jp2 = Jp2k(
             self.jp2_filename,
-            shape=(self.imageheight, self.imagewidth, self.spp),
+            shape=shape,
             tilesize=self.tilesize,
             **self.jp2_kwargs
         )

glymur/version.py

@@ -20,7 +20,7 @@ from .lib import tiff
 
 # Do not change the format of this next line!  Doing so risks breaking
 # setup.py
-version = "0.12.9post1"
+version = "0.13.0"
 
 version_tuple = parse(version).release
 

Glymur-0.12.9.post1.dist-info/RECORD

@@ -1,24 +0,0 @@
-glymur/__init__.py,sha256=2Ow4L_eja-L_aIGxWPTEa916-Bi_JzTUKdx-4sN0cQQ,570
-glymur/_iccprofile.py,sha256=_WfQsT-BqEWQzQVTtuY7tSXqPjOtwvWGW36rKxlLv1s,4148
-glymur/codestream.py,sha256=R9eEFFwndNpx4ixFFisfUJXi9bX5Ofp-eqGfULXOq4w,59979
-glymur/command_line.py,sha256=jm-6dD2jcU_G7mJAJ0U5sanfG9kRy-j0-G3eSN_Ieek,7476
-glymur/config.py,sha256=BDjNKkjb7oOleqSTxYpvS4uhEIo0TknVjvelJSUJKGM,4443
-glymur/core.py,sha256=IDkk8FESyukQTB10LHBZ4VQM36NwKE4CXCcuJ407Kzg,3638
-glymur/jp2box.py,sha256=FyyWoVc0Pse5A1UQWiOPoOvMhxJKleKjrBXuXzIH6BI,112477
-glymur/jp2k.py,sha256=9-bsIMqvpIAAiLJ2HHziWYP3iPx-9pC9Uq8IBbRt1X0,87324
-glymur/options.py,sha256=-JZrrDzYsLZZ9Rce6l9e_lxtSGtXoWo9j3wajyDHVi8,6386
-glymur/tiff.py,sha256=X8rG2NQoEI8MoXQYDZFQbTU2aG0yVSR77qA4FTiM3uI,41530
-glymur/version.py,sha256=SVfC9mw-20A3mAKdgksDO9H0hb1yoSsSWNOPJbGDlXs,986
-glymur/data/__init__.py,sha256=pU_6hn1_8aAVVdgCAIUY1B73VkLf_nSlunQuPcGgVTU,1163
-glymur/data/goodstuff.j2k,sha256=xKQG68KMu33gYjRUDTQvam1Cue2tdio85rNp5J-rYZE,115220
-glymur/data/heliov.jpx,sha256=KXnYdBZgl25jcGLu-m-QfhuP9pqUXV0Hp9HHEdJqr34,1399071
-glymur/data/nemo.jp2,sha256=EkRy3wgA3cwkYxweNDdD-4nHlrkPnPPyNjSKHWnYjYM,1135519
-glymur/lib/__init__.py,sha256=JnM9oPfcZhBDLKo7_yLS-lIRQ1wXb1N9hKKQ-G7vYVk,127
-glymur/lib/openjp2.py,sha256=NxpAPXAsq9TsUGP7pi_RDVF1wNrqG4JDZz22ZVOdQfw,43921
-glymur/lib/tiff.py,sha256=VVsNDhn8bc8OeZltu7cwbJ1Ccr2LCQ0dLy1lrNK1_0Y,51009
-Glymur-0.12.9.post1.dist-info/LICENSE.txt,sha256=G9pvBgkJdPTtZqQmoRyIgAydtic1ZwWtOWBea9VMW7I,1077
-Glymur-0.12.9.post1.dist-info/METADATA,sha256=QwV-zCP5JtRWAPu2BNQzfCBWhuUBVggIPgc_xDkuVyE,1080
-Glymur-0.12.9.post1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-Glymur-0.12.9.post1.dist-info/entry_points.txt,sha256=inzxpDbDDfIxtdXpCncAHdAdwJfjtXt3xKvIOsuZsG8,93
-Glymur-0.12.9.post1.dist-info/top_level.txt,sha256=D0SvtBUoPxOs40OTRW3l-kjGFHM6VrXS8yZPK5Fx2wY,7
-Glymur-0.12.9.post1.dist-info/RECORD,,