jevans
7ebe4ff59e
Fixed rlevel assignment issue causing segfault in 1.5.
...
Segfault introduced in 0e370f5882
2014-04-02 21:30:01 -04:00
jevans
0e370f5882
Refactoring, lint cleanup.
2014-04-02 20:49:17 -04:00
John Evans
eb6f5c87a9
Merge branch 'issue210' into devel
2014-04-02 12:22:31 -04:00
John Evans
63d203796b
Use memoryview instead of np.getbuffer. #210
...
np.getbuffer is not available in python3.
2014-04-02 12:21:56 -04:00
John Evans
d2ba8a14b6
Merge branch 'issue210' into devel
2014-04-02 11:29:03 -04:00
John Evans
eb1df90fb9
Speed up of about 33%, maybe? #210
...
Added a real fix for #209 , seeing about a 22% speed up there.
2014-04-02 11:28:00 -04:00
John Evans
8e6dc486da
If palette columns are the same width, read it in one step. #210
...
Should be more efficient, hopefully.
2014-04-02 10:35:24 -04:00
John Evans
9b533b72e3
Merge branch 'devel' into issue210
2014-04-02 09:50:20 -04:00
John Evans
fd41614b51
Merge branch 'issue136' into devel
2014-04-02 09:40:52 -04:00
John Evans
900a44f00b
Changed static methods into class methods. #136
...
Since the static methods were being used as constructors, they really
did deserve to be class methods.
2014-04-02 09:35:53 -04:00
John Evans
9840b66cae
Merge branch 'issue209' into devel
2014-04-02 09:01:21 -04:00
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
