jyapayne/glymur
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor of CME testing

Browse source
This commit is contained in:
John Evans 2014-09-19 09:17:40 -04:00
commit 3366812936
2 changed files with 99 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

2
glymur/codestream.py
View file

@ -1074,7 +1074,7 @@ class CMEsegment(Segment):
15444-1:2004 - Information technology -- JPEG 2000 image coding system: 15444-1:2004 - Information technology -- JPEG 2000 image coding system:
Core coding system Core coding system
""" """
def __init__(self, rcme, ccme, length, offset): def __init__(self, rcme, ccme, length=-1, offset=-1):
Segment.__init__(self, marker_id='CME') Segment.__init__(self, marker_id='CME')
self.rcme = rcme self.rcme = rcme
self.ccme = ccme self.ccme = ccme

318
glymur/test/test_opj_suite_dump.py
View file

@ -33,8 +33,10 @@ import unittest
import numpy as np import numpy as np
from glymur import Jp2k
import glymur import glymur
from glymur import Jp2k
from glymur.codestream import CMEsegment
from glymur.core import RCME_ISO_8859_1, RCME_BINARY
from .fixtures import OPJ_DATA_ROOT from .fixtures import OPJ_DATA_ROOT
from .fixtures import WARNING_INFRASTRUCTURE_ISSUE, WARNING_INFRASTRUCTURE_MSG from .fixtures import WARNING_INFRASTRUCTURE_ISSUE, WARNING_INFRASTRUCTURE_MSG
@ -66,6 +68,13 @@ class TestSuiteBase(unittest.TestCase):
for cl in clist: for cl in clist:
self.assertIn(cl, box.compatibility_list) self.assertIn(cl, box.compatibility_list)
def verifyCMEsegment(self, actual, expected):
"""
verify the fields of a CME (comment) segment
"""
self.assertEqual(actual.rcme, expected.rcme)
self.assertEqual(actual.ccme, expected.ccme)
def verifySizSegment(self, actual, expected): def verifySizSegment(self, actual, expected):
""" """
Verify the fields of the SIZ segment. Verify the fields of the SIZ segment.
@ -289,12 +298,8 @@ class TestSuite(TestSuiteBase):
self.assertEqual(c.segment[4].mantissa, self.assertEqual(c.segment[4].mantissa,
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0]) [0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
# COM: comment pargs = RCME_ISO_8859_1, "Creator: AV-J2K (c) 2000,2001 Algo Vision".encode()
# Registration self.verifyCMEsegment(c.segment[5], CMEsegment(*pargs))
self.assertEqual(c.segment[5].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[5].ccme.decode('latin-1'),
"Creator: AV-J2K (c) 2000,2001 Algo Vision")
# One unknown marker # One unknown marker
self.assertEqual(c.segment[6].marker_id, '0xff30') self.assertEqual(c.segment[6].marker_id, '0xff30')
@ -379,26 +384,15 @@ class TestSuite(TestSuiteBase):
self.assertEqual(c.segment[6].xcrg, (65424,)) self.assertEqual(c.segment[6].xcrg, (65424,))
self.assertEqual(c.segment[6].ycrg, (32558,)) self.assertEqual(c.segment[6].ycrg, (32558,))
# COM: comment pargs = RCME_ISO_8859_1, "Creator: AV-J2K (c) 2000,2001 Algo Vision".encode()
# Registration self.verifyCMEsegment(c.segment[7], CMEsegment(*pargs))
self.assertEqual(c.segment[7].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[7].ccme.decode('latin-1'),
"Creator: AV-J2K (c) 2000,2001 Algo Vision")
# COM: comment pargs = (RCME_ISO_8859_1,
# Registration "Creator: AV-J2K (c) 2000,2001 Algo Vision Technology".encode())
self.assertEqual(c.segment[8].rcme, glymur.core.RCME_ISO_8859_1) self.verifyCMEsegment(c.segment[8], CMEsegment(*pargs))
# Comment value
self.assertEqual(c.segment[8].ccme.decode('latin-1'),
"Creator: AV-J2K (c) 2000,"
+ "2001 Algo Vision Technology")
# COM: comment pargs = (RCME_BINARY, c.segment[9].ccme)
# Registration self.verifyCMEsegment(c.segment[9], CMEsegment(*pargs))
self.assertEqual(c.segment[9].rcme, glymur.core.RCME_BINARY)
# Comment value
self.assertEqual(len(c.segment[9].ccme), 62)
# TLM (tile-part length) # TLM (tile-part length)
self.assertEqual(c.segment[10].ztlm, 0) self.assertEqual(c.segment[10].ztlm, 0)
@ -497,12 +491,9 @@ class TestSuite(TestSuiteBase):
1845, 1868, 1925, 1925, 2007, 32, 32, 131, 2002, 1845, 1868, 1925, 1925, 2007, 32, 32, 131, 2002,
2002, 1888]) 2002, 1888])
# COM: comment pargs = (RCME_ISO_8859_1,
# Registration "Creator: AV-J2K (c) 2000,2001 Algo Vision".encode())
self.assertEqual(c.segment[6].rcme, glymur.core.RCME_ISO_8859_1) self.verifyCMEsegment(c.segment[6], CMEsegment(*pargs))
# Comment value
self.assertEqual(c.segment[6].ccme.decode('latin-1'),
"Creator: AV-J2K (c) 2000,2001 Algo Vision")
# SOT: start of tile part # SOT: start of tile part
self.assertEqual(c.segment[7].isot, 0) self.assertEqual(c.segment[7].isot, 0)
@ -622,12 +613,9 @@ class TestSuite(TestSuiteBase):
9, 9, 10]) 9, 9, 10])
self.assertEqual(c.segment[7].mantissa, [0] * 19) self.assertEqual(c.segment[7].mantissa, [0] * 19)
# COM: comment pargs = (RCME_ISO_8859_1,
# Registration "Creator: AV-J2K (c) 2000,2001 Algo Vision".encode())
self.assertEqual(c.segment[8].rcme, glymur.core.RCME_ISO_8859_1) self.verifyCMEsegment(c.segment[8], CMEsegment(*pargs))
# Comment value
self.assertEqual(c.segment[8].ccme.decode('latin-1'),
"Creator: AV-J2K (c) 2000,2001 Algo Vision")
# TLM (tile-part length) # TLM (tile-part length)
self.assertEqual(c.segment[9].ztlm, 0) self.assertEqual(c.segment[9].ztlm, 0)
@ -811,12 +799,8 @@ class TestSuite(TestSuiteBase):
self.assertEqual(c.segment[3].exponent, self.assertEqual(c.segment[3].exponent,
[14, 15, 15, 16, 15, 15, 16, 15, 15, 16]) [14, 15, 15, 16, 15, 15, 16, 15, 15, 16])
# COM: comment pargs = (RCME_ISO_8859_1, "Kakadu-3.0.7".encode())
# Registration self.verifyCMEsegment(c.segment[4], CMEsegment(*pargs))
self.assertEqual(c.segment[4].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[4].ccme.decode('latin-1'),
"Kakadu-3.0.7")
# SOT: start of tile part # SOT: start of tile part
self.assertEqual(c.segment[5].isot, 0) self.assertEqual(c.segment[5].isot, 0)
@ -965,12 +949,8 @@ class TestSuite(TestSuiteBase):
[11, 12, 12, 13, 12, 12, 13, 12, 12, 13, 12, 12, 13, [11, 12, 12, 13, 12, 12, 13, 12, 12, 13, 12, 12, 13,
12, 12, 13, 12, 12, 13, 12, 12, 13, 12, 12, 13]) 12, 12, 13, 12, 12, 13, 12, 12, 13, 12, 12, 13])
# COM: comment pargs = (RCME_ISO_8859_1, "Kakadu-3.0.7".encode())
# Registration self.verifyCMEsegment(c.segment[9], CMEsegment(*pargs))
self.assertEqual(c.segment[9].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[9].ccme.decode('latin-1'),
"Kakadu-3.0.7")
# SOT: start of tile part # SOT: start of tile part
self.assertEqual(c.segment[10].isot, 0) self.assertEqual(c.segment[10].isot, 0)
@ -1023,12 +1003,8 @@ class TestSuite(TestSuiteBase):
[16, 16, 16, 16, 15, 15, 15, 14, 14, 14, 12, 12, 12, [16, 16, 16, 16, 15, 15, 15, 14, 14, 14, 12, 12, 12,
11, 11, 12]) 11, 11, 12])
# COM: comment pargs = (RCME_ISO_8859_1, "Kakadu-3.0.7".encode())
# Registration self.verifyCMEsegment(c.segment[4], CMEsegment(*pargs))
self.assertEqual(c.segment[4].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[4].ccme.decode('latin-1'),
"Kakadu-3.0.7")
# SOT: start of tile part # SOT: start of tile part
self.assertEqual(c.segment[5].isot, 0) self.assertEqual(c.segment[5].isot, 0)
@ -1211,12 +1187,9 @@ class TestSuite(TestSuiteBase):
self.assertEqual(c.segment[3].mantissa, [0]) self.assertEqual(c.segment[3].mantissa, [0])
self.assertEqual(c.segment[3].exponent, [8]) self.assertEqual(c.segment[3].exponent, [8])
# COM: comment pargs = (RCME_ISO_8859_1,
# Registration "Creator: AV-J2K (c) 2000,2001 Algo Vision".encode())
self.assertEqual(c.segment[4].rcme, glymur.core.RCME_ISO_8859_1) self.verifyCMEsegment(c.segment[4], CMEsegment(*pargs))
# Comment value
self.assertEqual(c.segment[4].ccme.decode('latin-1'),
"Creator: AV-J2K (c) 2000,2001 Algo Vision")
# SOT: start of tile part # SOT: start of tile part
self.assertEqual(c.segment[5].isot, 0) self.assertEqual(c.segment[5].isot, 0)
@ -1279,12 +1252,8 @@ class TestSuite(TestSuiteBase):
self.assertEqual(c.segment[3].exponent, self.assertEqual(c.segment[3].exponent,
[8, 9, 9, 10, 9, 9, 10, 9, 9, 10]) [8, 9, 9, 10, 9, 9, 10, 9, 9, 10])
# COM: comment pargs = (RCME_ISO_8859_1, "Creator: AV-J2K (c) 2000,2001 Algo Vision".encode())
# Registration self.verifyCMEsegment(c.segment[4], CMEsegment(*pargs))
self.assertEqual(c.segment[4].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[4].ccme.decode('latin-1'),
"Creator: AV-J2K (c) 2000,2001 Algo Vision")
# SOT: start of tile part # SOT: start of tile part
self.assertEqual(c.segment[5].isot, 0) self.assertEqual(c.segment[5].isot, 0)
@ -1397,12 +1366,8 @@ class TestSuite(TestSuiteBase):
self.assertEqual(c.segment[8].ppod, self.assertEqual(c.segment[8].ppod,
(glymur.core.RLCP, glymur.core.CPRL)) (glymur.core.RLCP, glymur.core.CPRL))
# COM: comment pargs = (RCME_ISO_8859_1, "Creator: AV-J2K (c) 2000,2001 Algo Vision".encode())
# Registration self.verifyCMEsegment(c.segment[9], CMEsegment(*pargs))
self.assertEqual(c.segment[9].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[9].ccme.decode('latin-1'),
"Creator: AV-J2K (c) 2000,2001 Algo Vision")
# SOT: start of tile part # SOT: start of tile part
self.assertEqual(c.segment[10].isot, 0) self.assertEqual(c.segment[10].isot, 0)
@ -1459,12 +1424,8 @@ class TestSuite(TestSuiteBase):
[10, 11, 11, 12, 11, 11, 12, 11, 11, 12, 11, 11, 12, [10, 11, 11, 12, 11, 11, 12, 11, 11, 12, 11, 11, 12,
11, 11, 12]) 11, 11, 12])
# COM: comment pargs = (RCME_ISO_8859_1, "Kakadu-3.0.7".encode())
# Registration self.verifyCMEsegment(c.segment[4], CMEsegment(*pargs))
self.assertEqual(c.segment[4].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[4].ccme.decode('latin-1'),
"Kakadu-3.0.7")
# SOT: start of tile part # SOT: start of tile part
self.assertEqual(c.segment[5].isot, 0) self.assertEqual(c.segment[5].isot, 0)
@ -1540,26 +1501,15 @@ class TestSuite(TestSuiteBase):
self.assertEqual(c.segment[6].xcrg, (65424,)) self.assertEqual(c.segment[6].xcrg, (65424,))
self.assertEqual(c.segment[6].ycrg, (32558,)) self.assertEqual(c.segment[6].ycrg, (32558,))
# COM: comment pargs = (RCME_ISO_8859_1, "Creator: AV-J2K (c) 2000,2001 Algo Vision".encode())
# Registration self.verifyCMEsegment(c.segment[7], CMEsegment(*pargs))
self.assertEqual(c.segment[7].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[7].ccme.decode('latin-1'),
"Creator: AV-J2K (c) 2000,2001 Algo Vision")
# COM: comment pargs = (RCME_ISO_8859_1,
# Registration "Creator: AV-J2K (c) 2000,2001 Algo Vision Technology".encode())
self.assertEqual(c.segment[8].rcme, glymur.core.RCME_ISO_8859_1) self.verifyCMEsegment(c.segment[8], CMEsegment(*pargs))
# Comment value
self.assertEqual(c.segment[8].ccme.decode('latin-1'),
"Creator: AV-J2K (c) 2000,"
+ "2001 Algo Vision Technology")
# COM: comment pargs = (RCME_BINARY, c.segment[9].ccme)
# Registration self.verifyCMEsegment(c.segment[9], CMEsegment(*pargs))
self.assertEqual(c.segment[9].rcme, glymur.core.RCME_BINARY)
# Comment value
self.assertEqual(len(c.segment[9].ccme), 62)
# TLM: tile-part length # TLM: tile-part length
self.assertEqual(c.segment[10].ztlm, 0) self.assertEqual(c.segment[10].ztlm, 0)
@ -1733,12 +1683,8 @@ class TestSuite(TestSuiteBase):
self.assertEqual(c.segment[4].exponent, self.assertEqual(c.segment[4].exponent,
[8, 9, 9, 10, 9, 9, 10, 9, 9, 10]) [8, 9, 9, 10, 9, 9, 10, 9, 9, 10])
# COM: comment pargs = (RCME_ISO_8859_1, "Creator: AV-J2K (c) 2000,2001 Algo Vision".encode())
# Registration self.verifyCMEsegment(c.segment[5], CMEsegment(*pargs))
self.assertEqual(c.segment[5].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[5].ccme.decode('latin-1'),
"Creator: AV-J2K (c) 2000,2001 Algo Vision")
# SOT: start of tile part # SOT: start of tile part
self.assertEqual(c.segment[6].isot, 0) self.assertEqual(c.segment[6].isot, 0)
@ -1835,12 +1781,8 @@ class TestSuite(TestSuiteBase):
[14, 14, 14, 14, 13, 13, 13, 12, 12, 12, 11, 11, 11, [14, 14, 14, 14, 13, 13, 13, 12, 12, 12, 11, 11, 11,
9, 9, 9, 9, 9, 9]) 9, 9, 9, 9, 9, 9])
# COM: comment pargs = (RCME_ISO_8859_1, "Creator: AV-J2K (c) 2000,2001 Algo Vision".encode())
# Registration self.verifyCMEsegment(c.segment[6], CMEsegment(*pargs))
self.assertEqual(c.segment[6].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[6].ccme.decode('latin-1'),
"Creator: AV-J2K (c) 2000,2001 Algo Vision")
# SOT: start of tile part # SOT: start of tile part
self.assertEqual(c.segment[7].isot, 0) self.assertEqual(c.segment[7].isot, 0)
@ -1963,12 +1905,8 @@ class TestSuite(TestSuiteBase):
[8, 9, 9, 10, 9, 9, 10, 9, 9, 10, 9, 9, 10, 9, 9, 10, [8, 9, 9, 10, 9, 9, 10, 9, 9, 10, 9, 9, 10, 9, 9, 10,
9, 9, 10]) 9, 9, 10])
# COM: comment pargs = (RCME_ISO_8859_1, "Creator: AV-J2K (c) 2000,2001 Algo Vision".encode())
# Registration self.verifyCMEsegment(c.segment[8], CMEsegment(*pargs))
self.assertEqual(c.segment[8].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[8].ccme.decode('latin-1'),
"Creator: AV-J2K (c) 2000,2001 Algo Vision")
# PPM: packed packet headers, main header # PPM: packed packet headers, main header
self.assertEqual(c.segment[9].marker_id, 'PPM') self.assertEqual(c.segment[9].marker_id, 'PPM')
@ -2046,12 +1984,8 @@ class TestSuite(TestSuiteBase):
554, 546, 542, 635, 826, 667, 617, 606, 813, 586, 554, 546, 542, 635, 826, 667, 617, 606, 813, 586,
641, 654, 669, 623)) 641, 654, 669, 623))
# COM: comment pargs = (RCME_ISO_8859_1, "Created by Aware, Inc.".encode())
# Registration self.verifyCMEsegment(c.segment[5], CMEsegment(*pargs))
self.assertEqual(c.segment[5].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[5].ccme.decode('latin-1'),
"Created by Aware, Inc.")
# SOT: start of tile part # SOT: start of tile part
self.assertEqual(c.segment[6].isot, 0) self.assertEqual(c.segment[6].isot, 0)
@ -2148,12 +2082,8 @@ class TestSuite(TestSuiteBase):
[17, 17, 17, 17, 16, 16, 16, 15, 15, 15, 14, 14, [17, 17, 17, 17, 16, 16, 16, 15, 15, 15, 14, 14,
14, 13, 13, 13, 11, 11, 11, 11, 11, 11]) 14, 13, 13, 13, 11, 11, 11, 11, 11, 11])
# COM: comment pargs = (RCME_ISO_8859_1, "Creator: AV-J2K (c) 2000,2001 Algo Vision".encode())
# Registration self.verifyCMEsegment(c.segment[4], CMEsegment(*pargs))
self.assertEqual(c.segment[4].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[4].ccme.decode('latin-1'),
"Creator: AV-J2K (c) 2000,2001 Algo Vision")
# 225 consecutive PPM segments. # 225 consecutive PPM segments.
zppm = [x.zppm for x in c.segment[5:230]] zppm = [x.zppm for x in c.segment[5:230]]
@ -2223,12 +2153,8 @@ class TestSuite(TestSuiteBase):
[14, 14, 14, 14, 13, 13, 13, 11, 11, 11, [14, 14, 14, 14, 13, 13, 13, 11, 11, 11,
11, 11, 11]) 11, 11, 11])
# COM: comment pargs = (RCME_ISO_8859_1, "Creator: AV-J2K (c) 2000,2001 Algo Vision".encode())
# Registration self.verifyCMEsegment(c.segment[4], CMEsegment(*pargs))
self.assertEqual(c.segment[4].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[4].ccme.decode('latin-1'),
"Creator: AV-J2K (c) 2000,2001 Algo Vision")
# SOT: start of tile part # SOT: start of tile part
self.assertEqual(c.segment[5].isot, 0) self.assertEqual(c.segment[5].isot, 0)
@ -2318,12 +2244,8 @@ class TestSuite(TestSuiteBase):
self.assertEqual(c.segment[4].mantissa, [0] * 4) self.assertEqual(c.segment[4].mantissa, [0] * 4)
self.assertEqual(c.segment[4].exponent, [8, 9, 9, 10]) self.assertEqual(c.segment[4].exponent, [8, 9, 9, 10])
# COM: comment pargs = (RCME_ISO_8859_1, "Creator: AV-J2K (c) 2000,2001 Algo Vision".encode())
# Registration self.verifyCMEsegment(c.segment[5], CMEsegment(*pargs))
self.assertEqual(c.segment[5].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[5].ccme.decode('latin-1'),
"Creator: AV-J2K (c) 2000,2001 Algo Vision")
# SOT: start of tile part # SOT: start of tile part
self.assertEqual(c.segment[6].isot, 0) self.assertEqual(c.segment[6].isot, 0)
@ -2449,12 +2371,8 @@ class TestSuite(TestSuiteBase):
[18, 18, 18, 18, 17, 17, 17, 16, 16, 16, 14, 14, [18, 18, 18, 18, 17, 17, 17, 16, 16, 16, 14, 14,
14, 14, 14, 14]) 14, 14, 14, 14])
# COM: comment pargs = (RCME_ISO_8859_1, "Created by OpenJPEG version 1.3.0".encode())
# Registration self.verifyCMEsegment(c.segment[8], CMEsegment(*pargs))
self.assertEqual(c.segment[8].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[8].ccme.decode('latin-1'),
"Created by OpenJPEG version 1.3.0")
# TLM (tile-part length) # TLM (tile-part length)
self.assertEqual(c.segment[9].ztlm, 0) self.assertEqual(c.segment[9].ztlm, 0)
@ -2697,11 +2615,8 @@ class TestSuite(TestSuiteBase):
[22, 22, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 19, [22, 22, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 19,
18, 18, 18]) 18, 18, 18])
# COM: comment pargs = (RCME_ISO_8859_1, "Kakadu-3.2".encode())
# Registration self.verifyCMEsegment(c.segment[4], CMEsegment(*pargs))
self.assertEqual(c.segment[4].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[4].ccme.decode('latin-1'), "Kakadu-3.2")
def test_NR_cthead1_dump(self): def test_NR_cthead1_dump(self):
jfile = opj_data_file('input/nonregression/cthead1.j2k') jfile = opj_data_file('input/nonregression/cthead1.j2k')
@ -2751,17 +2666,8 @@ class TestSuite(TestSuiteBase):
[9, 10, 10, 11, 10, 10, 11, 10, 10, 11, 10, 10, 10, [9, 10, 10, 11, 10, 10, 11, 10, 10, 11, 10, 10, 10,
9, 9, 10]) 9, 9, 10])
# COM: comment pargs = (RCME_ISO_8859_1, "Kakadu-v6.3.1".encode())
# Registration self.verifyCMEsegment(c.segment[4], CMEsegment(*pargs))
self.assertEqual(c.segment[4].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[4].ccme.decode('latin-1'), "Kakadu-v6.3.1")
# COM: comment
# Registration
self.assertEqual(c.segment[4].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[4].ccme.decode('latin-1'), "Kakadu-v6.3.1")
def test_NR_illegalcolortransform_dump(self): def test_NR_illegalcolortransform_dump(self):
jfile = opj_data_file('input/nonregression/illegalcolortransform.j2k') jfile = opj_data_file('input/nonregression/illegalcolortransform.j2k')
@ -2856,11 +2762,8 @@ class TestSuite(TestSuiteBase):
self.assertEqual(c.segment[3].exponent, [8, 9, 9, 10, 9, 9, 10, 9, 9, self.assertEqual(c.segment[3].exponent, [8, 9, 9, 10, 9, 9, 10, 9, 9,
10, 9, 9, 10, 9, 9, 10]) 10, 9, 9, 10, 9, 9, 10])
# COM: comment pargs = (RCME_BINARY, c.segment[4].ccme)
# Registration self.verifyCMEsegment(c.segment[4], CMEsegment(*pargs))
self.assertEqual(c.segment[4].rcme, glymur.core.RCME_BINARY)
# Comment value
self.assertEqual(len(c.segment[4].ccme), 36)
def test_NR_kakadu_v4_4_openjpegv2_broken_dump(self): def test_NR_kakadu_v4_4_openjpegv2_broken_dump(self):
jfile = opj_data_file('input/nonregression/' jfile = opj_data_file('input/nonregression/'
@ -2906,31 +2809,26 @@ class TestSuite(TestSuiteBase):
[17, 18, 18, 19, 18, 18, 19, 18, 18, 19, 18, 18, 19, [17, 18, 18, 19, 18, 18, 19, 18, 18, 19, 18, 18, 19,
18, 18, 19, 18, 18, 19, 18, 18, 19, 18, 18, 19]) 18, 18, 19, 18, 18, 19, 18, 18, 19, 18, 18, 19])
# COM: comment pargs = (RCME_ISO_8859_1, "Kakadu-v4.4".encode())
# Registration self.verifyCMEsegment(c.segment[4], CMEsegment(*pargs))
self.assertEqual(c.segment[4].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value ccme = "Kdu-Layer-Info: log_2{Delta-D(MSE)/[2^16*Delta-L(bytes)]},"
self.assertEqual(c.segment[4].ccme.decode('latin-1'), "Kakadu-v4.4") ccme += " L(bytes)\n"
ccme += " -65.4, 6.8e+004\n"
ccme += " -66.3, 1.0e+005\n"
ccme += " -67.3, 2.0e+005\n"
ccme += " -68.5, 4.1e+005\n"
ccme += " -69.0, 5.1e+005\n"
ccme += " -69.5, 5.9e+005\n"
ccme += " -69.7, 6.8e+005\n"
ccme += " -70.3, 8.2e+005\n"
ccme += " -70.8, 1.0e+006\n"
ccme += " -71.9, 1.4e+006\n"
ccme += " -73.8, 2.0e+006\n"
ccme += "-256.0, 3.7e+006\n"
pargs = (RCME_ISO_8859_1, ccme.encode())
self.verifyCMEsegment(c.segment[5], CMEsegment(*pargs))
# COM: comment
# Registration
self.assertEqual(c.segment[5].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
expected = "Kdu-Layer-Info: log_2{Delta-D(MSE)/[2^16*Delta-L(bytes)]},"
expected += " L(bytes)\n"
expected += " -65.4, 6.8e+004\n"
expected += " -66.3, 1.0e+005\n"
expected += " -67.3, 2.0e+005\n"
expected += " -68.5, 4.1e+005\n"
expected += " -69.0, 5.1e+005\n"
expected += " -69.5, 5.9e+005\n"
expected += " -69.7, 6.8e+005\n"
expected += " -70.3, 8.2e+005\n"
expected += " -70.8, 1.0e+006\n"
expected += " -71.9, 1.4e+006\n"
expected += " -73.8, 2.0e+006\n"
expected += "-256.0, 3.7e+006\n"
self.assertEqual(c.segment[5].ccme.decode('latin-1'), expected)
def test_NR_MarkerIsNotCompliant_j2k_dump(self): def test_NR_MarkerIsNotCompliant_j2k_dump(self):
jfile = opj_data_file('input/nonregression/MarkerIsNotCompliant.j2k') jfile = opj_data_file('input/nonregression/MarkerIsNotCompliant.j2k')
@ -3241,12 +3139,8 @@ class TestSuite(TestSuiteBase):
[18, 19, 19, 20, 19, 19, 20, 19, 19, 20, 19, 19, 20, [18, 19, 19, 20, 19, 19, 20, 19, 19, 20, 19, 19, 20,
19, 19, 20]) 19, 19, 20])
# COM: comment pargs = (RCME_ISO_8859_1, "Kakadu-2.0.2".encode())
# Registration self.verifyCMEsegment(c.segment[4], CMEsegment(*pargs))
self.assertEqual(c.segment[4].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[4].ccme.decode('latin-1'),
"Kakadu-2.0.2")
def test_NR_test_lossless_j2k_dump(self): def test_NR_test_lossless_j2k_dump(self):
jfile = opj_data_file('input/nonregression/test_lossless.j2k') jfile = opj_data_file('input/nonregression/test_lossless.j2k')
@ -3295,12 +3189,8 @@ class TestSuite(TestSuiteBase):
[12, 13, 13, 14, 13, 13, 14, 13, 13, 14, 13, 13, 14, [12, 13, 13, 14, 13, 13, 14, 13, 13, 14, 13, 13, 14,
13, 13, 14]) 13, 13, 14])
# COM: comment pargs = (RCME_ISO_8859_1, "ClearCanvas DICOM OpenJPEG".encode())
# Registration self.verifyCMEsegment(c.segment[4], CMEsegment(*pargs))
self.assertEqual(c.segment[4].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[4].ccme.decode('latin-1'),
"ClearCanvas DICOM OpenJPEG")
def test_NR_123_j2c_dump(self): def test_NR_123_j2c_dump(self):
jfile = opj_data_file('input/nonregression/123.j2c') jfile = opj_data_file('input/nonregression/123.j2c')
@ -3445,12 +3335,8 @@ class TestSuite(TestSuiteBase):
[13, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, [13, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13,
13, 13, 13]) 13, 13, 13])
# COM: comment pargs = (RCME_ISO_8859_1, "DCP-Werkstatt".encode())
# Registration self.verifyCMEsegment(c.segment[4], CMEsegment(*pargs))
self.assertEqual(c.segment[4].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[4].ccme.decode('latin-1'),
"DCP-Werkstatt")
def test_NR_issue104_jpxstream_dump(self): def test_NR_issue104_jpxstream_dump(self):
jfile = opj_data_file('input/nonregression/issue104_jpxstream.jp2') jfile = opj_data_file('input/nonregression/issue104_jpxstream.jp2')
@ -3691,12 +3577,8 @@ class TestSuite(TestSuiteBase):
self.assertEqual(c.segment[3].exponent, self.assertEqual(c.segment[3].exponent,
[14] * 4 + [13] * 3 + [12] * 3 + [10] * 6) [14] * 4 + [13] * 3 + [12] * 3 + [10] * 6)
# COM: comment pargs = (RCME_ISO_8859_1, "Kakadu-v5.2.1".encode())
# Registration self.verifyCMEsegment(c.segment[4], CMEsegment(*pargs))
self.assertEqual(c.segment[4].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[4].ccme.decode('latin-1'),
"Kakadu-v5.2.1")
def test_NR_mem_b2b86b74_2753_dump(self): def test_NR_mem_b2b86b74_2753_dump(self):
jfile = opj_data_file('input/nonregression/mem-b2b86b74-2753.jp2') jfile = opj_data_file('input/nonregression/mem-b2b86b74-2753.jp2')
@ -3928,12 +3810,8 @@ class TestSuiteWarns(TestSuiteBase):
'xyrsiz': [(1, 1, 1), (1, 1, 1)]} 'xyrsiz': [(1, 1, 1), (1, 1, 1)]}
self.verifySizSegment(c.segment[1], glymur.codestream.SIZsegment(**kwargs)) self.verifySizSegment(c.segment[1], glymur.codestream.SIZsegment(**kwargs))
# COM: comment pargs = RCME_ISO_8859_1, "Creator: JasPer Vers)on 1.701.0".encode()
# Registration self.verifyCMEsegment(c.segment[2], CMEsegment(*pargs))
self.assertEqual(c.segment[2].rcme, glymur.core.RCME_ISO_8859_1)
# Comment value
self.assertEqual(c.segment[2].ccme.decode('latin-1'),
"Creator: JasPer Vers)on 1.701.0")
# COD: Coding style default # COD: Coding style default
self.assertFalse(c.segment[3].scod & 2) # no sop self.assertFalse(c.segment[3].scod & 2) # no sop