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

Refactored the TLM segment. #130

Browse source
This commit is contained in:
John Evans 2014-04-04 12:17:58 -04:00
commit 2dc4e8400e
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
glymur/codestream.py
View file

@ -802,8 +802,8 @@ class Codestream(object):
read_buffer = fptr.read(2) read_buffer = fptr.read(2)
length, = struct.unpack('>H', read_buffer) length, = struct.unpack('>H', read_buffer)
read_buffer = fptr.read(2) read_buffer = fptr.read(length - 2)
ztlm, stlm = struct.unpack('>BB', read_buffer) ztlm, stlm = struct.unpack_from('>BB', read_buffer)
ttlm_st = (stlm >> 4) & 0x3 ttlm_st = (stlm >> 4) & 0x3
ptlm_sp = (stlm >> 6) & 0x1 ptlm_sp = (stlm >> 6) & 0x1
@ -813,7 +813,6 @@ class Codestream(object):
else: else:
ntiles = nbytes / (ttlm_st + (ptlm_sp + 1) * 2) ntiles = nbytes / (ttlm_st + (ptlm_sp + 1) * 2)
read_buffer = fptr.read(nbytes)
if ttlm_st == 0: if ttlm_st == 0:
ttlm = None ttlm = None
fmt = '' fmt = ''
@ -827,7 +826,8 @@ class Codestream(object):
else: else:
fmt += 'I' fmt += 'I'
data = struct.unpack('>' + fmt * int(ntiles), read_buffer) data = struct.unpack_from('>' + fmt * int(ntiles), read_buffer,
offset=2)
if ttlm_st == 0: if ttlm_st == 0:
ttlm = None ttlm = None
ptlm = data ptlm = data