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

Parsing entire codestream again, just keeping header, though.

Browse source
This commit is contained in:
John Evans 2013-07-19 17:06:27 -04:00
commit 44eac7659b
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
glymur/codestream.py
View file

@ -5,6 +5,7 @@ codestreams.
""" """
# pylint: disable=C0302,R0902,R0903,R0913 # pylint: disable=C0302,R0902,R0903,R0913
from itertools import takewhile
import math import math
import struct import struct
import sys import sys
@ -104,11 +105,6 @@ class Codestream(object):
read_buffer = fptr.read(2) read_buffer = fptr.read(2)
marker_id, = struct.unpack('>H', read_buffer) marker_id, = struct.unpack('>H', read_buffer)
if marker_id == 0xff90 and header_only:
# start-of-tile (SOT) means we are out of the main header.
# No need to go any further.
break
try: try:
segment = self._process_marker_segment(fptr, marker_id) segment = self._process_marker_segment(fptr, marker_id)
except InconsistentStartOfTileError as isote: except InconsistentStartOfTileError as isote:
@ -125,7 +121,7 @@ class Codestream(object):
if marker_id == 0xff93: if marker_id == 0xff93:
# If SOD, then we need to seek past the tile part bit stream. # If SOD, then we need to seek past the tile part bit stream.
if self._parse_tpart_flag: if self._parse_tpart_flag and not header_only:
# But first parse the tile part bit stream for SOP and # But first parse the tile part bit stream for SOP and
# EPH segments. # EPH segments.
self._parse_tile_part_bit_stream(fptr, segment, self._parse_tile_part_bit_stream(fptr, segment,
@ -133,6 +129,13 @@ class Codestream(object):
fptr.seek(self._tile_offset[-1] + self._tile_length[-1]) fptr.seek(self._tile_offset[-1] + self._tile_length[-1])
if header_only:
# start-of-tile (SOT) means we are out of the main header.
# No need to go any further.
gen = takewhile(lambda s: s.marker_id != 'SOT', self.segment)
self.segment = list(gen)
def _process_marker_segment(self, fptr, marker_id): def _process_marker_segment(self, fptr, marker_id):
"""Process and return a segment from the codestream. """Process and return a segment from the codestream.
""" """