Commit graph

935 commits

Author SHA1 Message Date
John Evans
9ef39ddecb Updated test for unknown superbox printing. #209
Can no longer detect known interior boxes.  That's ok for now.
2014-04-02 09:00:23 -04:00
jevans
aacee3ddcf Merge branch 'devel' of https://github.com/quintusdias/glymur into devel 2014-04-02 07:07:29 -04:00
jevans
f6b1bd4d29 Merge branch 'issue208' into devel 2014-04-02 07:07:04 -04:00
jevans
7418dd9cac Refactored try/except fragment of box parsing. 2014-04-02 07:06:13 -04:00
John Evans
c2cae15723 Merge branch 'issue208' into devel 2014-04-01 20:56:08 -04:00
John Evans
6314458bc7 Simplified pclr writing in most cases. #208 2014-04-01 20:53:59 -04:00
jevans
738c338246 Merge branch 'issue202' into devel 2014-03-31 21:23:50 -04:00
jevans
96cb70e5a5 Added negative test for writing with bad approximation. #202 2014-03-31 21:23:11 -04:00
jevans
d96d1ff150 Merge branch 'issue206' into devel 2014-03-26 21:05:45 -04:00
jevans
6815a46902 Refactoring. #206 2014-03-26 21:04:28 -04:00
jevans
9b4e0a10fb More testing for jpx wrapping. Needs some refactoring, though. #206 2014-03-25 21:17:29 -04:00
jevans
9ecbc81e7a Strengthened the test by reordering the boxes. #206 2014-03-24 21:26:04 -04:00
jevans
faf49b11c3 Added ability to wrap more than one codestream. #206 2014-03-24 20:54:49 -04:00
jevans
9be8bed66a Updated for upstream openjpeg changes. #206 2014-03-24 18:36:17 -04:00
John Evans
69cb3d5401 Merge branch 'issue205' into devel 2014-03-23 11:33:30 -04:00
John Evans
9399ef8496 Adjusted tests for newer JPX file. #205 2014-03-23 11:33:03 -04:00
jevans
02651a420d Merge branch 'issue204' into devel 2014-03-22 20:50:32 -04:00
jevans
992cd5b205 not explicitly encoding non-superbox IDs upon write anymore. #204 2014-03-22 20:49:04 -04:00
John Evans
2642e1ab55 Merge branch 'issue188' into devel 2014-03-20 09:10:58 -04:00
John Evans
6060ccd37d Readded jpch, jplh write support. #188 2014-03-20 09:10:24 -04:00
jevans
49f7c0e1f6 Merge branch 'issue188' into devel 2014-03-19 20:15:13 -04:00
jevans
cf4317df57 Added Colour group box support. #188 2014-03-19 20:14:46 -04:00
John Evans
8a448600d2 Merge branch 'issue204' into devel 2014-03-19 16:53:54 -04:00
John Evans
0a826ad882 Most parsing and writing warning/exceptions now regularized. #203
Only exception was ftbl and flst, because ftbl is the one box consisting
of boxes that is not a superbox.
2014-03-19 16:53:31 -04:00
John Evans
4e3d58ed20 Merge branch 'issue197' into devel 2014-03-19 15:17:11 -04:00
John Evans
55a01cbc39 Not decoding box ID anymore. #197
We don't actually use the box ID as parsed from the file, so there was
no need to decode it.  This means that unrecognized box IDs are actually
kept as bytes, but no big deal.  The code is simplified a bit because of
this.
2014-03-19 15:15:55 -04:00
John Evans
2a75fcfff2 Merge branch 'issue194' into devel 2014-03-19 11:24:06 -04:00
John Evans
2ab8691898 Added warning about incorrect ftyp brand. #194
While at it, added new infrastructure for either erroring or just
warning when an conformance issue is encountered.  If parsing a file, we
warn.  If about to write a file, we error out.
2014-03-19 11:22:44 -04:00
John Evans
235e53ce87 Merge branch 'issue198' into devel 2014-03-19 10:01:34 -04:00
John Evans
f5741697d9 Test shouldn't run on 2.7 #198 2014-03-19 10:01:13 -04:00
John Evans
baba6c9bc5 Merge branch 'issue198' into devel 2014-03-19 09:21:45 -04:00
John Evans
1808d563b9 Warn instead of error out when reading invalid approximation. #198 2014-03-19 09:21:10 -04:00
jevans
f9e27fe551 Merge branch 'issue201' into devel 2014-03-18 20:05:20 -04:00
jevans
661f5bfadb Cinema 2K and Cinema 4K profiles are printed as such. #201 2014-03-18 20:04:50 -04:00
jevans
869f8e9e3e Merge branch 'issue199' into devel 2014-03-18 18:48:47 -04:00
jevans
f42c892287 Another case for a modified defaultdict. #199 2014-03-18 18:48:09 -04:00
John Evans
34cc6783df Merge branch 'issue196' into devel 2014-03-18 15:03:33 -04:00
John Evans
01524dcb99 Hardened the handling of RSIZ and profiles. #196
Did not have an entry for RSIZ=4 ==> Profile 4 for cinema 4K.
2014-03-18 15:02:41 -04:00
John Evans
b7807fa445 Merge branch 'issue193' into devel 2014-03-18 13:09:59 -04:00
John Evans
181dab1650 Fixed incorrect tests on account of #193
Probably should not have used this file as it is highly corrupt.
2014-03-18 13:04:22 -04:00
quintusdias
847d121972 Merge pull request #193 from bogdanni/patch-1
'cmap' - correct stride interpreting CMP,MTYP,PCOL
2014-03-18 12:17:46 -04:00
John Evans
80f135c7bd Merge branch 'issue195' into devel 2014-03-18 12:09:32 -04:00
John Evans
161833ee5c Checking for bad wavelet transform while parsing. #195
Being more intelligent about printing in such cases.
2014-03-18 12:08:16 -04:00
John Evans
d6cd57896f One doubled up test, failing one in wrong section. #179 2014-03-18 11:33:49 -04:00
John Evans
ec8c5906e8 Merge branch 'issue179' into devel
Conflicts:
	glymur/test/test_jp2k.py
	glymur/test/test_opj_suite_write.py
2014-03-18 11:16:59 -04:00
John Evans
1be7c4ec50 Changing name to "ignore_pclr_cmap_cdef". #179 2014-03-18 11:00:35 -04:00
John Evans
d483e2cd4b Merge branch 'issue179' of github.com:quintusdias/glymur into issue179 2014-03-18 10:39:26 -04:00
bogdanni
844540df92 'cmap' - correct stride interpreting CMP,MTYP,PCOL
Fix for number of components different from 3
2014-03-18 15:22:40 +01:00
John Evans
0c32b403b0 Merge branch 'issue192' into devel 2014-03-17 19:57:49 -04:00
John Evans
74a960ed84 Added printing of lxml version. #192 2014-03-17 19:57:15 -04:00