From 82a9edae6246c2703b12887f85af01e606039de6 Mon Sep 17 00:00:00 2001 From: jevans Date: Wed, 12 Nov 2014 21:09:09 -0500 Subject: [PATCH] progress --- glymur/jp2k.py | 4 ++-- glymur/test/test_jp2k.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/glymur/jp2k.py b/glymur/jp2k.py index 25efacd..a33d466 100644 --- a/glymur/jp2k.py +++ b/glymur/jp2k.py @@ -966,7 +966,7 @@ class Jp2k(Jp2kBox): numrows if rows.stop is None else rows.stop, numcols if cols.stop is None else cols.stop ) - data = self.read(area=area, rlevel=rlevel) + data = self._read(area=area, rlevel=rlevel) if len(pargs) == 2: return data @@ -974,7 +974,7 @@ class Jp2k(Jp2kBox): return data[:, :, bands] - def _read(self): + def _read(self, **kwargs): """Read a JPEG 2000 image. Returns diff --git a/glymur/test/test_jp2k.py b/glymur/test/test_jp2k.py index 5e28db0..dda8161 100644 --- a/glymur/test/test_jp2k.py +++ b/glymur/test/test_jp2k.py @@ -1379,7 +1379,7 @@ class TestJp2kOpjDataRoot(unittest.TestCase): # Should be able to manually reconstruct the RGB image from the palette # and indices. - palette = j.box[2].box[1].palette + palette = jp2.box[2].box[1].palette rgb_from_idx = np.zeros(rgb.shape, dtype=np.uint8) for r in np.arange(rgb.shape[0]): for c in np.arange(rgb.shape[1]):