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
quintusdias
eaa9f33b25
Merge pull request #191 from bogdanni/patch-1
...
'nlst' - compositing layer association display fix
2014-03-17 15:01:14 -04:00
bogdanni
dec37eec49
'nlst' - compositing layer association display fix
2014-03-17 14:42:33 +01:00
jevans
4a1bba217e
Merge branch 'issue139' into devel
2014-03-15 22:11:19 -04:00
jevans
093f9c49fb
Got 2.0.0 working again. #139
2014-03-15 22:09:49 -04:00
jevans
569476c688
Merge branch 'devel' into issue139
2014-03-15 20:36:54 -04:00
jevans
b46eb9bb29
Merge branch 'issue139' of https://github.com/quintusdias/glymur into issue139
2014-03-15 20:36:19 -04:00
John Evans
993e669cc4
Fixed test now that openjpeg version has rolled to 2.1.0
2014-03-15 11:24:15 -04:00
John Evans
24687124d3
Merge branch 'issue190' into devel
2014-03-14 10:40:29 -04:00
John Evans
b614f4818f
Added proper unittest.skipIf when skimage.io plugin freeimage not found. #190
2014-03-14 10:39:51 -04:00
John Evans
ffbf0bdbf8
Merge branch 'issue185' into devel
2014-03-13 21:40:02 -04:00
John Evans
86ac1c4ae5
Fixed test skipping when no OPJ_DATA_ROOT present. #185
2014-03-13 21:39:24 -04:00
John Evans
9ff572f9fd
Merge branch 'issue185' into devel
2014-03-13 21:18:36 -04:00
John Evans
58d3d9dc04
Remove any BOM and encoding declaration from xml text. #185
2014-03-13 21:17:53 -04:00
John Evans
6b7176bf67
Merge branch 'issue187' into devel
2014-03-13 19:43:04 -04:00
John Evans
d82c9b465e
Less than 8 bytes at end of file indicates corruption. #187
2014-03-13 19:41:05 -04:00
John Evans
d76305683f
Added jp2 and jpx cxform tests. jpx fails on i386 linux.
2014-03-13 18:46:29 -04:00
John Evans
35dd743ba8
Merge branch 'issue179' of github.com:quintusdias/glymur into devel
2014-03-13 18:24:56 -04:00
John Evans
7afd2f6956
Merge branch 'devel' of github.com:quintusdias/glymur into devel
2014-03-13 18:01:17 -04:00
John Evans
ada829406c
Merge branch 'issue179' into devel
2014-03-13 18:01:02 -04:00
John Evans
48d2c97a39
Merge branch 'issue186' into devel
2014-03-13 14:36:55 -04:00
John Evans
e15a8a6dba
Don't error out when progression order is invalid. #186
...
Instead of a regular dictionary for the display of progression order,
use a subclass of defaultdict instead. The defaultdict's __missing__
method is overridden to supply a custom error message that used the
offending key. Everybody wins!!!
2014-03-13 14:34:16 -04:00
John Evans
2708e85be1
Merge branch 'issue182' into devel
2014-03-13 12:26:41 -04:00
John Evans
8f95a67013
Updated test to skip since it needs OPJ_DATA_ROOT. #182
...
Updated tests for #183 and #184 as well. Refactored tests in
test_printing, split into those needing OPJ_DATA_ROOT and those
who don't.
2014-03-13 12:24:31 -04:00
John Evans
baecdad9b2
Merge branch 'devel' into issue182
2014-03-13 12:04:09 -04:00
