Commit graph

859 commits

Author SHA1 Message Date
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
John Evans
03d1553363 Merge branch 'issue184' into devel 2014-03-12 20:52:45 -04:00
John Evans
42e1b21356 Should not raise an exception during parsing of XML box. #184 2014-03-12 20:50:42 -04:00
John Evans
d35422250c Merge branch 'issue181' into devel 2014-03-12 20:03:43 -04:00
John Evans
2ae848b6f0 Checking for division by zero with bad tile dimensions. #181 2014-03-12 20:03:04 -04:00
John Evans
9e98f044c7 Merge branch 'issue183' into devel 2014-03-12 19:22:34 -04:00
John Evans
77d2ab194a Checking for ICC profile that is None. #183 2014-03-12 19:21:35 -04:00
John Evans
df651a66d8 Merge branch 'issue182' into devel 2014-03-12 12:28:24 -04:00
John Evans
c56b919c36 Fixed printing of cmap boxes when not pclr. #182 2014-03-12 12:27:52 -04:00
John Evans
4d4ecac166 Merge branch 'issue159' into devel 2014-03-12 10:11:19 -04:00
John Evans
b479ece7b4 Bring back check for bad rlevel. #159
OpenJPEG 1.5 needs the protection, it would seem.
2014-03-12 10:10:38 -04:00
John Evans
539ee438f6 Removed repeated/mangled testpoint. 2014-03-12 09:16:15 -04:00
John Evans
07398a33d5 Merge branch 'issue139' into devel 2014-03-12 08:57:35 -04:00
John Evans
ac3aa4d664 alpha is a uint16, not a uint16 pointer. #139 2014-03-12 08:57:11 -04:00
John Evans
f761e6815c Merge branch 'devel' into issue139 2014-03-12 08:45:41 -04:00
John Evans
0ebb506800 Merge branch 'devel' of github.com:quintusdias/glymur into devel 2014-03-12 08:34:04 -04:00
jevans
868d275c97 Merge branch 'issue159' into devel 2014-03-11 21:40:55 -04:00
jevans
d098dd5d5e Removed consideration of openjpeg versions 1.3 and 1.4. #159 2014-03-11 21:40:19 -04:00
jevans
735d3afff6 Merge branch 'issue180' into devel 2014-03-11 21:03:16 -04:00
jevans
1cefd80a76 Just remove the conformance tests, they aren't really needed. #180 2014-03-11 21:02:15 -04:00
John Evans
e75364e372 Merge branch 'issue139' into devel 2014-03-11 15:47:36 -04:00
John Evans
96f32395eb Merge branch 'devel' of github.com:quintusdias/glymur into devel 2014-03-11 15:47:23 -04:00
John Evans
417503764e Updated through r2691. #139 2014-03-11 15:46:17 -04:00
John Evans
3e490d0c28 Rewrote the test for a file truncated by 5000 bytes. #180 2014-03-10 20:44:24 -04:00
John Evans
c8fdf399f1 Merge branch 'issue139' into devel
Conflicts:
	glymur/test/test_jp2k.py
	glymur/test/test_opj_suite.py
	glymur/test/test_printing.py
2014-03-10 20:13:07 -04:00
John Evans
de6984e204 Validated through 2686. #139 2014-03-10 19:54:38 -04:00
John Evans
4a3c768a4b Updated tests for r2651 in opj_data_root. 2014-03-08 20:36:05 -05:00
John Evans
8827908b28 Updated through r2651. #139 2014-03-08 15:23:35 -05:00
John Evans
554f066d0b Added alpha member. Updated through r2451. #139 2014-03-08 14:13:36 -05:00
John Evans
ed5c6a37b4 Added .gitignore 2014-03-08 13:57:33 -05:00
John Evans
82f60b328b Validated through r2436. #139
Most cinema code was moved into the library between 2386 and 2436,
so most of glymur's was removed period.
2014-03-08 13:19:17 -05:00
John Evans
47b8dad003 Check for supplying cinema2k/4k with other options. #139 2014-03-08 07:46:12 -05:00
John Evans
4ecc23b6bf Verified through r2386. #139 2014-03-07 12:08:46 -05:00
John Evans
d74c514302 Merge branch 'issue139' into devel 2014-03-07 11:01:01 -05:00
John Evans
d68b1aacb1 Cinema4K seems to be working. #139 2014-03-07 11:00:20 -05:00
John Evans
af4b6e64bf Refactoring. #139 2014-03-07 08:40:14 -05:00
John Evans
9a74109501 Added cinema2k/48 support. #139 2014-03-07 07:00:02 -05:00
jevans
80326718a5 Finished Cinema2K upstream tests. #139 2014-03-06 21:13:40 -05:00
John Evans
3bad8a4b2e Added negative test for cinema2k frame rate not 24 or 48. #139
Some refactoring of cinema2k code.
2014-03-06 09:20:21 -05:00
John Evans
afa611ae54 Can write and parse Cinema2K image. #139
Using scikit-image to read the test data.  Testing still not complete.
2014-03-06 07:10:29 -05:00
John Evans
b6a17d60f1 Starting to implement cinema2k support. #139
Need to add scikit-image with freeimage backend in order to read
16-bit TIFFs.
2014-03-05 21:17:35 -05:00
John Evans
2fbdf146b4 Verified through r2366. #139
423 of 457 glymur tests passing, 34 skips
21 of 214 openjpeg tests failed
2014-03-05 07:04:10 -05:00
John Evans
a224e7dff8 Merge branch 'issue177' into devel 2014-03-02 11:18:32 -05:00
John Evans
53f46fa0d9 Wrapping indentation for sake of 2.7. #177
Textwrap's indent method is not available on 2.7, so we have to fake it
ourselves.
2014-03-02 11:17:44 -05:00
John Evans
692cee0345 Merge branch 'issue176' into devel 2014-03-01 12:31:44 -05:00
John Evans
5bfe7d7b95 Merge branch 'issue176' of https://github.com/quintusdias/glymur into issue176
Conflicts:
	glymur/test/fixtures.py
2014-03-01 12:31:02 -05:00