John Evans
de28b3b1a1
Merge branch 'issue232' into devel
2014-05-10 16:12:18 -04:00
John Evans
2750aced14
Updated versioning for pending 0.6.0 release. Removed documentation cruft.
2014-05-10 16:10:58 -04:00
John Evans
0a4bb217e3
Removed two tests that we chose not to run because of stderr issues.
...
They produce too much output on stderr, it would make interpreting test
results difficult.
2014-05-10 16:02:35 -04:00
John Evans
bf65a00f28
Improved warning message when brand is not proper. #232
2014-05-10 15:58:57 -04:00
John Evans
a79e234f8a
Removed apparently unreachable XML code for 2.6.
2014-05-10 15:54:28 -04:00
John Evans
756ade30fa
Merge branch 'devel' of https://github.com/quintusdias/glymur into devel
...
Conflicts:
glymur/test/test_jp2box_jpx.py
glymur/test/test_jp2k.py
glymur/test/test_opj_suite.py
2014-05-10 15:36:33 -04:00
John Evans
d48b0bde50
Merge branch 'issue228' into devel
2014-05-10 15:30:53 -04:00
John Evans
937d8c971c
Warnings tested with warnings.catch_warnings infrastructure.
...
Until there's some explanation as to why assertWarns method is failing,
this seems to be the only way forward.
2014-05-10 15:29:36 -04:00
jevans
564a9d2410
Removed tests that still cannot be run as of 2.1.0
2014-05-08 20:16:02 -04:00
John Evans
9fc3395693
Merge branch 'issue227' into devel
2014-04-27 14:16:08 -04:00
John Evans
4d15054b0c
Fixed cinema profile writing on 2.1. #227
...
Was not forcing CINEMA_2K, 4K images to be written out as 12bps in 2.1.0. Was
ok in 2.0.1.
Removed "OPJ_" prefix from CINEMA_{24,48}_COMP and CINEMA_{24,48}_CS fields in
core.
2014-04-27 14:15:06 -04:00
John Evans
3fbeacc581
Merge branch 'issue221' into devel
2014-04-26 12:15:33 -04:00
jevans
1e754f0e85
Updated openjp2 API for upstream openjpeg r2837 and r2847. #221
...
Removed "_v3" suffixes from glymur.lib.openjp2 functions.
Changed JP2k object to use both 2.0 and 2.1 means of setting cinema
compression parameter values.
2014-04-26 12:11:26 -04:00
quintusdias
772f6fbaef
Merge pull request #225 from bogdanni/patch-1
...
Lower case for 'glymur' package name in setup.py
2014-04-24 15:35:41 -04:00
quintusdias
835673d2c5
Merge pull request #226 from bogdanni/patch-2
...
Python 2.6 is not supported anymore
2014-04-24 15:34:54 -04:00
Bogdan Nicula
e6723b18dd
Python 2.6 is not supported anymore
2014-04-24 21:06:44 +02:00
Bogdan Nicula
b24ae781a6
Lower case for 'glymur' package name in setup.py
...
Is there a reason for different capitalization?
2014-04-24 21:04:08 +02:00
John Evans
62b0464f39
Merge branch 'issue224' into devel
2014-04-24 12:03:36 -04:00
John Evans
e4578db535
Removed OPENJP2_IS_V2_OFFICIAL token. #224
...
This can be done by a regular expression against the library version.
It had not been done because much of the original development was
against the svn 2.0+ version of openjpeg before the library version got
bumped to 2.1
2014-04-24 12:01:53 -04:00
jevans
346ae47b10
Merge branch 'devel' of https://github.com/quintusdias/glymur into devel
2014-04-23 20:13:15 -04:00
jevans
275324fce8
Merge branch 'issue217' into devel
2014-04-23 20:06:53 -04:00
jevans
506e4fff92
Improved code coverage to over 95%
2014-04-23 20:05:49 -04:00
quintusdias
f971d5bbcb
Merge pull request #220 from bogdanni/patch-1
...
DataEntryURLBox.write(): one too many url.encode()
2014-04-19 20:10:32 -04:00
Bogdan Nicula
a7e160133f
DataEntryURLBox.write(): one too many url.encode()
2014-04-20 02:22:59 +03:00
John Evans
afb61d28e6
Merge branch 'issue218' into devel
2014-04-09 17:03:06 -04:00
John Evans
0c19deb182
Added main_header_offset to ContiguousCodestreamBox. #218
2014-04-09 17:02:36 -04:00
quintusdias
7d3fbb2883
Merge pull request #215 from bogdanni/patch-1
...
jp2box.py: _parse_rreq3 - small fixup
2014-04-09 09:12:17 -04:00
bogdanni
e5dd222905
jp2box.py: _parse_rreq3 - small fixup
2014-04-09 14:41:23 +02:00
quintusdias
446a9be1ce
Merge pull request #214 from bogdanni/patch-1
...
Small cleanups in jp2box.py
2014-04-08 21:06:58 -04:00
John Evans
718eb9dd6e
Merge branch 'issue212' into devel
2014-04-08 21:04:05 -04:00
John Evans
f71aeaee73
Fixed test on python2.7
2014-04-08 21:03:34 -04:00
John Evans
807a0e5d3c
Merge branch 'issue200' into issue212
2014-04-08 20:57:04 -04:00
John Evans
487cc9c967
Added set and get_parseoptions to control codestream parsing. #212
2014-04-08 20:54:52 -04:00
bogdanni
d89be23af2
Small cleanups in jp2box.py
2014-04-08 23:27:59 +02:00
jevans
b719313554
main_header of Codestream object is now a property. #212
...
This improves loading time of glymur.data.jpxfile() by 33%.
2014-04-06 18:31:23 -04:00
jevans
96db5e1a6a
Removed box_is_XL parameter. #212
...
We only get around a 1% performance increase, which is not worth the
increased complexitiy.
2014-04-06 10:51:50 -04:00
jevans
f15913cee6
Refactored reader requireents box to use just a single file read. #212
2014-04-05 22:24:11 -04:00
jevans
578470e149
Refactored PCLR box parsing to use a single file read operation. #212
2014-04-05 17:16:49 -04:00
jevans
bb4e5cfe16
Refactored dtbl box to use just a single file read. #212
2014-04-05 15:41:49 -04:00
John Evans
02f02ce154
Merge branch 'issue213' into devel
2014-04-04 13:55:26 -04:00
John Evans
2e1af15cb1
Adjusted some comments in XML box parsing. #213
2014-04-04 13:54:58 -04:00
John Evans
1485bda7ff
Passing down XL flag into each box parser. #212
...
This should prevent having to call the tell method on the file pointer.
2014-04-04 13:24:16 -04:00
John Evans
c12180ccb0
Merge branch 'issue204' into devel
2014-04-04 12:27:52 -04:00
John Evans
196255d780
No superbox needs to encode its box ID anymore. #204
2014-04-04 12:27:11 -04:00
John Evans
0c8b11b722
Merge branch 'issue130' into devel
2014-04-04 12:20:09 -04:00
John Evans
2dc4e8400e
Refactored the TLM segment. #130
2014-04-04 12:17:58 -04:00
John Evans
3dbaf9f458
Refactored QCC segment parsing. #130
2014-04-04 07:11:43 -04:00
jevans
828abe942a
Removed one read statement, using struct.unpack_from. #130
2014-04-03 22:53:52 -04:00
jevans
4e19e688a0
Variable renaming. #130
2014-04-03 22:52:11 -04:00
jevans
6ee48e3f91
Merge branch 'issue130' of https://github.com/quintusdias/glymur into issue130
...
Conflicts:
glymur/jp2box.py
2014-04-03 21:38:08 -04:00