"except Exception" was totally unnecessary, Closes #95
This commit is contained in:
parent
915e032280
commit
f46cdfb759
1 changed files with 8 additions and 12 deletions
|
|
@ -183,11 +183,6 @@ class Codestream(object):
|
||||||
msg = msg.format(self._offset, self._marker_id)
|
msg = msg.format(self._offset, self._marker_id)
|
||||||
warnings.warn(msg)
|
warnings.warn(msg)
|
||||||
break
|
break
|
||||||
except Exception as error:
|
|
||||||
# Treat this as a warning.
|
|
||||||
msg = str(error)
|
|
||||||
warnings.warn(msg)
|
|
||||||
break
|
|
||||||
|
|
||||||
self.segment.append(segment)
|
self.segment.append(segment)
|
||||||
|
|
||||||
|
|
@ -223,13 +218,6 @@ class Codestream(object):
|
||||||
segment = self._parse_reserved_segment(fptr)
|
segment = self._parse_reserved_segment(fptr)
|
||||||
return segment
|
return segment
|
||||||
|
|
||||||
def _parse_reserved_marker(self, fptr):
|
|
||||||
"""Marker range between 0xff30 and 0xff39.
|
|
||||||
"""
|
|
||||||
the_id = '0x{0:x}'.format(self._marker_id)
|
|
||||||
segment = Segment(marker_id=the_id, offset=self._offset, length=0)
|
|
||||||
return segment
|
|
||||||
|
|
||||||
def _parse_reserved_segment(self, fptr):
|
def _parse_reserved_segment(self, fptr):
|
||||||
"""Parse valid marker segment, segment description is unknown.
|
"""Parse valid marker segment, segment description is unknown.
|
||||||
|
|
||||||
|
|
@ -766,6 +754,14 @@ class Codestream(object):
|
||||||
|
|
||||||
return TLMsegment(length, offset, ztlm, ttlm, ptlm)
|
return TLMsegment(length, offset, ztlm, ttlm, ptlm)
|
||||||
|
|
||||||
|
# pylint: disable=W0613
|
||||||
|
def _parse_reserved_marker(self, fptr):
|
||||||
|
"""Marker range between 0xff30 and 0xff39.
|
||||||
|
"""
|
||||||
|
the_id = '0x{0:x}'.format(self._marker_id)
|
||||||
|
segment = Segment(marker_id=the_id, offset=self._offset, length=0)
|
||||||
|
return segment
|
||||||
|
|
||||||
|
|
||||||
class Segment(object):
|
class Segment(object):
|
||||||
"""Segment information.
|
"""Segment information.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue