Commit graph

79 commits

Author SHA1 Message Date
John Evans
6f697526f2 pep8 work, closes #307 2014-12-31 22:41:02 -05:00
jevans
13cc6aa7e5 pep8 work 2014-12-23 08:59:17 -05:00
jevans
c39661b586 pep8 cleanup 2014-11-21 21:53:39 -05:00
John Evans
6a59e38aed reading metadata still works if library not installed, closes #304 2014-11-21 19:32:40 -05:00
jevans
1f0d0c3786 deleted TccpInfo, TileInfoV2, CodestreamInvoV2 classes
They are used in tests, but not in top-level glymur classes.
2014-11-05 20:33:10 -05:00
John Evans
5aac625981 added test for None usage in config file, closes #293 2014-10-23 12:21:37 -04:00
jevans
ad42363586 fix error message when no OpenJPEG library can be found, closes #284 2014-10-21 18:02:16 -04:00
jevans
ff849df520 add __str__ methods for openjp2 ctypes structures, refactored their use
The openjp2 structures are now largely maintained as weak internal-use-only
attributes where possible.  This allows us to inspect (print) them from
the command line after the fact.
2014-10-21 12:57:19 -04:00
jevans
185f4da073 fix library path issue when no configuration file exists, #265 2014-10-21 12:57:19 -04:00
jevans
60dcdfe9c5 refactored configuration file handling, closes #265 2014-10-18 23:59:32 -04:00
jevans
41252f54de tidied up top-level imports, closes #277 2014-10-18 23:09:15 -04:00
jevans
4ac5b575d2 config module refactor 2014-09-22 21:15:12 -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
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
093f9c49fb Got 2.0.0 working again. #139 2014-03-15 22:09:49 -04:00
John Evans
ac3aa4d664 alpha is a uint16, not a uint16 pointer. #139 2014-03-12 08:57:11 -04:00
John Evans
554f066d0b Added alpha member. Updated through r2451. #139 2014-03-08 14:13:36 -05:00
jevans
79d2969acc Merge branch 'issue104' into devel
Conflicts:
	CHANGES.txt
	docs/source/how_do_i.rst
	glymur/codestream.py
	glymur/jp2box.py
	glymur/test/test_jp2box.py
	glymur/test/test_jp2k.py
2014-02-08 20:29:52 -05:00
John Evans
423daf1dfe Removed support for 2.6. Closes #150 2014-02-05 15:20:33 -05:00
John Evans
c8f6aff4d8 pylint work. #104 2014-01-24 15:56:50 -05:00
John Evans
75cb8957fc Have to put the check for path existance into the library default stanza.
Issue #138
2013-10-29 10:04:47 -04:00
John Evans
dd19340db2 Add additional path existance check to avoid unnecessary warning. #138
The warnings would come about if running on mac or windows where the
library could not be found via ctypes or the configuration file.
2013-10-29 09:17:32 -04:00
jevans
f321c0d29b More refactoring, fewer branches. #138 2013-10-28 21:20:52 -04:00
jevans
14d4b60896 Abstracted out loading of openjp2, openjpeg libraries. #138
That much was common to both load_openjp2 and load_openjpeg.  Reduces
number of different moving parts.
2013-10-28 20:04:17 -04:00
John Evans
425b13a7f1 Simpler configuration check allows not-installed to be caught earlier.
Issue #138
2013-10-28 16:43:27 -04:00
John Evans
9422bccffb Forgot to actually set argtypes for openjp2 read_header function. #125 2013-10-01 10:55:28 -04:00
John Evans
89c0863706 openjp2's decode_tile_data handler was returning the codec. It should not. #125 2013-09-30 14:55:20 -04:00
John Evans
813f5f3a03 Moved argtypes and restype into each respective function. #125 2013-09-30 14:30:45 -04:00
jevans
cc10537c14 Using existing openjp2 handlers for now. #112
Seems a little greasy, but it works.  Probably should think about a
separate error handler, though.
2013-09-12 21:07:58 -04:00
jevans
5b401e1e2d Writing works with 1.5, two failures with 3.3. #111 2013-09-11 20:30:54 -04:00
jevans
d070cc4144 Filled in more of openjpeg write definitions. #111 2013-09-10 20:11:32 -04:00
John Evans
3753dc5e60 pylint work, #99 2013-08-13 06:53:59 -04:00
jevans
63168e6b3a pylint work, #99 2013-08-10 16:42:08 -04:00
John Evans
8a8b4cb0ad pep8 work, #99 2013-08-10 13:05:10 -04:00
John Evans
d7a06f29ed pylint work, #99 2013-08-10 13:04:58 -04:00
John Evans
0eb58e4ae4 pylint work, #99 2013-08-10 07:12:31 -04:00
John Evans
93270a0d50 Removed monkey-patching of the library version when not found. #90 2013-07-30 09:51:40 -04:00
John G Evans
2a34561689 Had wrong location for default windows openjp2 install. #90 2013-07-30 08:18:13 -04:00
jevans
5a78d9ad8e Added windows stanza for default openjp2 installation location. #90 2013-07-29 20:11:52 -04:00
John Evans
ca740f90f9 Need to infer the location of openjp2 when not found by ctypes. #90 2013-07-29 17:50:37 -04:00
John Evans
372bfc2943 Pylint work. #90 2013-07-29 11:55:39 -04:00
John Evans
8120c21299 Pep8 work. #90 2013-07-29 11:40:47 -04:00
John Evans
c2a94b92f1 First full run through successful with v2.0.0 official, with write support. #90 2013-07-29 09:54:04 -04:00
jevans
b0566e4791 Some read support in 2.0.0. Some segfaults, though. #90 2013-07-28 16:14:20 -04:00
jevans
589dec5189 Adding libc module for purpose of 2.0.0 support. 2013-07-27 21:23:40 -04:00
John Evans
c1c6080b18 Windows if-statement is now a catch-all for config file location.
Closes #91, again.
2013-07-27 19:31:24 -04:00
John G Evans
1ad3e94129 Using os.path.expanduser on windows to figure out where to put config file. 2013-07-26 14:32:53 -04:00
John Evans
b909272181 Added warning when neither library found, monkey-patched version.
Did some things I'm not proud of...  Should revisit this.
2013-07-25 18:41:38 -04:00
John Evans
1d23ffcfbf Not trying to running opj_version upon import anymore when no library.
This should allow us to warn but not error out when neither library is
present.  We should be able to retrieve metadata on such configurations.
2013-07-25 15:27:53 -04:00
John Evans
ece145699e Removed warning if libraries not found; we error out first. #86 2013-07-24 19:01:36 -04:00