jyapayne/glymur
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'issue234' into devel

Browse source
This commit is contained in:
John Evans 2014-05-12 06:35:16 -04:00
commit 9bcea6c090
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
glymur/jp2k.py
View file

@ -180,9 +180,9 @@ class Jp2k(Jp2kBox):
if re.match("2.0", version.openjpeg_version) is not None: if re.match("2.0", version.openjpeg_version) is not None:
# 2.0 API # 2.0 API
if fps == 24: if fps == 24:
cparams.cp_cinema = core.OPJ_CINEMA_2K_24 cparams.cp_cinema = core.OPJ_CINEMA2K_24
else: else:
cparams.cp_cinema = core.OPJ_CINEMA_2K_48 cparams.cp_cinema = core.OPJ_CINEMA2K_48
else: else:
# 2.1 API # 2.1 API
if fps == 24: if fps == 24:
@ -198,7 +198,7 @@ class Jp2k(Jp2kBox):
# cinema4k # cinema4k
if re.match("2.0", version.openjpeg_version) is not None: if re.match("2.0", version.openjpeg_version) is not None:
# 2.0 API # 2.0 API
cparams.cp_cinema = core.OPJ_CINEMA_4K_24 cparams.cp_cinema = core.OPJ_CINEMA4K_24
else: else:
# 2.1 API # 2.1 API
cparams.rsiz = core.OPJ_PROFILE_CINEMA_4K cparams.rsiz = core.OPJ_PROFILE_CINEMA_4K