python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-04 21:50:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6518 from radarhere/pdf_ccittfaxdecode

Browse Source
This commit is contained in:
Hugo van Kemenade 2022-08-31 13:55:46 +03:00 committed by GitHub
commit b953f73548
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/test_file_pdf.py
View File

@ -6,7 +6,7 @@ import time
import pytest import pytest
from PIL import Image, PdfParser from PIL import Image, PdfParser, features
from .helper import hopper, mark_if_feature_version from .helper import hopper, mark_if_feature_version
@ -44,7 +44,7 @@ def test_monochrome(tmp_path):
# Act / Assert # Act / Assert
outfile = helper_save_as_pdf(tmp_path, mode) outfile = helper_save_as_pdf(tmp_path, mode)
assert os.path.getsize(outfile) < 5000 assert os.path.getsize(outfile) < (5000 if features.check("libtiff") else 15000)
def test_greyscale(tmp_path): def test_greyscale(tmp_path):

33
src/PIL/PdfImagePlugin.py
View File

@ -25,7 +25,7 @@ import math
import os import os
import time import time
from . import Image, ImageFile, ImageSequence, PdfParser, __version__ from . import Image, ImageFile, ImageSequence, PdfParser, __version__, features
# #
# -------------------------------------------------------------------- # --------------------------------------------------------------------
@ -130,20 +130,23 @@ def _save(im, fp, filename, save_all=False):
width, height = im.size width, height = im.size
if im.mode == "1": if im.mode == "1":
filter = "CCITTFaxDecode" if features.check("libtiff"):
bits = 1 filter = "CCITTFaxDecode"
params = PdfParser.PdfArray( bits = 1
[ params = PdfParser.PdfArray(
PdfParser.PdfDict( [
{ PdfParser.PdfDict(
"K": -1, {
"BlackIs1": True, "K": -1,
"Columns": width, "BlackIs1": True,
"Rows": height, "Columns": width,
} "Rows": height,
) }
] )
) ]
)
else:
filter = "DCTDecode"
colorspace = PdfParser.PdfName("DeviceGray") colorspace = PdfParser.PdfName("DeviceGray")
procset = "ImageB" # grayscale procset = "ImageB" # grayscale
elif im.mode == "L": elif im.mode == "L":