mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-04-25 03:23:41 +03:00
Merge pull request #6518 from radarhere/pdf_ccittfaxdecode
This commit is contained in:
commit
b953f73548
|
@ -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):
|
||||||
|
|
|
@ -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,6 +130,7 @@ def _save(im, fp, filename, save_all=False):
|
||||||
width, height = im.size
|
width, height = im.size
|
||||||
|
|
||||||
if im.mode == "1":
|
if im.mode == "1":
|
||||||
|
if features.check("libtiff"):
|
||||||
filter = "CCITTFaxDecode"
|
filter = "CCITTFaxDecode"
|
||||||
bits = 1
|
bits = 1
|
||||||
params = PdfParser.PdfArray(
|
params = PdfParser.PdfArray(
|
||||||
|
@ -144,6 +145,8 @@ def _save(im, fp, filename, save_all=False):
|
||||||
)
|
)
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
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":
|
||||||
|
|
Loading…
Reference in New Issue
Block a user