Skip to content

BUG: Handle cases where decodeParms is an ArrayObject #405

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
MartinThoma merged 11 commits into from
Apr 16, 2022
Merged

BUG: Handle cases where decodeParms is an ArrayObject #405

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a22f95f
Handle cases where /DecodeParms is an ArrayObject
jc275 Mar 15, 2018
a66dbb6
fix typos: decodeParams -> decodeParms
jc275 Mar 15, 2018
1fbeba3
fix error inside for-loop
jc275 Mar 15, 2018
05a7866
fix: add missing import struct
jc275 Mar 15, 2018
626e973
Merge pull request #1 from mstamy2/master
jc275 Apr 1, 2019
1dbeaa5
Merge branch 'main' into master
MartinThoma Apr 16, 2022
ba156df
Update PyPDF2/filters.py
MartinThoma Apr 16, 2022
b8c6586
Fix merge conflicts
MartinThoma Apr 16, 2022
1c52fd5
Slightly re-structure how to deal with array objects
MartinThoma Apr 16, 2022
e37c3a1
Update PyPDF2/filters.py
MartinThoma Apr 16, 2022
c7cf748
Missing import - sorry
MartinThoma Apr 16, 2022
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
26 changes: 19 additions & 7 deletions PyPDF2/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,15 @@ def decode(data, decodeParms):
predictor = 1
if decodeParms:
try:
predictor = decodeParms.get(LZW.PREDICTOR, 1)
from PyPDF2.generic import ArrayObject
if isinstance(decodeParms, ArrayObject):
for decodeParm in decodeParms:
if '/Predictor' in decodeParm:
predictor = decodeParm['/Predictor']
else:
predictor = decodeParms.get("/Predictor", 1)
except AttributeError:
pass # usually an array with a null object was read

pass # usually an array with a null object was read
# predictor 1 == no predictor
if predictor != 1:
columns = decodeParms[LZW.COLUMNS]
Expand Down Expand Up @@ -363,17 +368,24 @@ def decode(data, decodeParms=None):

class CCITTFaxDecode(object):
def decode(data, decodeParms=None, height=0):
k = 1
width = 0
if decodeParms:
from PyPDF2.generic import ArrayObject
if isinstance(decodeParms, ArrayObject):
if len(decodeParms) == 1:
decodeParms = decodeParms[0]
if decodeParms.get("/K", 1) == -1:
for decodeParm in decodeParms:
if CCITT.COLUMNS in decodeParm:
width = decodeParm[CCITT.COLUMNS]
if CCITT.K in decodeParm:
k = decodeParm[CCITT.K]
else:
width = decodeParms[CCITT.COLUMNS]
k = decodeParms[CCITT.K]
if k == -1:
CCITTgroup = 4
else:
CCITTgroup = 3

width = decodeParms[CCITT.COLUMNS]
imgSize = len(data)
tiff_header_struct = '<2shlh' + 'hhll' * 8 + 'h'
tiffHeader = struct.pack(tiff_header_struct,
Expand Down