Skip to content

Fix a bug in _readInlineImage #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mstamy2 merged 4 commits into from
May 15, 2016
Merged

Fix a bug in _readInlineImage #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dbb7ea3
Remove extraneous zeros from the standard formatting.
May 3, 2016
6e9d021
Remove extraneous zeros from the standard formatting.
May 3, 2016
077782d
Merge remote-tracking branch 'origin/master'
May 3, 2016
9dadb45
Fix a bug in _readInlineImage. We were looking for the operation EI a…
May 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions PyPDF2/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,12 @@ def __repr__(self):
if self == self.to_integral():
return str(self.quantize(decimal.Decimal(1)))
else:
# XXX: this adds useless extraneous zeros.
return "%.5f" % self
# Standard formatting adds useless extraneous zeros.
o = "%.5f" % self
# Remove the zeros.
while o and o[-1] == '0':
o = o[:-1]
return o

def as_numeric(self):
return float(b_(repr(self)))
Expand Down
7 changes: 5 additions & 2 deletions PyPDF2/pdf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2731,13 +2731,16 @@ def _readInlineImage(self, stream):
# Check for End Image
tok2 = stream.read(1)
if tok2 == b_("I"):
# Sometimes that data will contain EI, so check for the Q operator.
# Data can contain EI, so check for the Q operator.
tok3 = stream.read(1)
info = tok + tok2
# We need to find whitespace between EI and Q.
has_q_whitespace = False
while tok3 in utils.WHITESPACES:
has_q_whitespace = True
info += tok3
tok3 = stream.read(1)
if tok3 == b_("Q"):
if tok3 == b_("Q") and has_q_whitespace:
stream.seek(-1, 1)
break
else:
Expand Down