diff --git a/src/img2pdf.py b/src/img2pdf.py index d65335e..210b2d7 100755 --- a/src/img2pdf.py +++ b/src/img2pdf.py @@ -401,9 +401,9 @@ class pdfdoc(object): # either embed the whole jpeg or deflate the bitmap representation if imgformat is ImageFormat.JPEG: - ofilter = [PdfName.DCTDecode] + ofilter = PdfName.DCTDecode elif imgformat is ImageFormat.JPEG2000: - ofilter = [PdfName.JPXDecode] + ofilter = PdfName.JPXDecode self.writer.version = "1.5" # jpeg2000 needs pdf 1.5 elif imgformat is ImageFormat.CCITTGroup4: ofilter = PdfName.CCITTFaxDecode diff --git a/src/tests/__init__.py b/src/tests/__init__.py index 00426be..3c89b0f 100644 --- a/src/tests/__init__.py +++ b/src/tests/__init__.py @@ -554,9 +554,9 @@ def test_suite(): # test if the filter is valid: self.assertIn( - imgprops.Filter, [[PdfName.DCTDecode], [PdfName.JPXDecode], - [PdfName.FlateDecode], - [PdfName.CCITTFaxDecode]]) + imgprops.Filter, [PdfName.DCTDecode, PdfName.JPXDecode, + PdfName.FlateDecode, + PdfName.CCITTFaxDecode]) # test if the colorspace is valid self.assertIn( imgprops.ColorSpace, [PdfName.DeviceGray, @@ -568,12 +568,12 @@ def test_suite(): self.assertEqual(imgprops.Height, str(orig_img.size[1])) # if the input file is a jpeg then it should've been copied # verbatim into the PDF - if imgprops.Filter in [[PdfName.DCTDecode], - [PdfName.JPXDecode]]: + if imgprops.Filter in [PdfName.DCTDecode, + PdfName.JPXDecode]: self.assertEqual( cur_page.Resources.XObject.Im0.stream, convert_load(orig_imgdata)) - elif imgprops.Filter == [PdfName.CCITTFaxDecode]: + elif imgprops.Filter == PdfName.CCITTFaxDecode: tiff_header = tiff_header_for_ccitt( int(imgprops.Width), int(imgprops.Height), int(imgprops.Length), 4) @@ -589,7 +589,7 @@ def test_suite(): except AttributeError: pass - elif imgprops.Filter == [PdfName.FlateDecode]: + elif imgprops.Filter == PdfName.FlateDecode: # otherwise, the data is flate encoded and has to be equal # to the pixel data of the input image imgdata = zlib.decompress( diff --git a/src/tests/output/CMYK.jpg.pdf b/src/tests/output/CMYK.jpg.pdf index bfe67f3..9efbe16 100644 Binary files a/src/tests/output/CMYK.jpg.pdf and b/src/tests/output/CMYK.jpg.pdf differ diff --git a/src/tests/output/CMYK.tif.pdf b/src/tests/output/CMYK.tif.pdf index b00586b..242bac7 100644 Binary files a/src/tests/output/CMYK.tif.pdf and b/src/tests/output/CMYK.tif.pdf differ diff --git a/src/tests/output/gray.png.pdf b/src/tests/output/gray.png.pdf index 5737760..3f2d4c3 100644 Binary files a/src/tests/output/gray.png.pdf and b/src/tests/output/gray.png.pdf differ diff --git a/src/tests/output/mono.png.pdf b/src/tests/output/mono.png.pdf index 77c3704..af98641 100644 Binary files a/src/tests/output/mono.png.pdf and b/src/tests/output/mono.png.pdf differ diff --git a/src/tests/output/normal.jpg.pdf b/src/tests/output/normal.jpg.pdf index 87d2645..7acbe20 100644 Binary files a/src/tests/output/normal.jpg.pdf and b/src/tests/output/normal.jpg.pdf differ diff --git a/src/tests/output/normal.png.pdf b/src/tests/output/normal.png.pdf index 2e34ad4..971475f 100644 Binary files a/src/tests/output/normal.png.pdf and b/src/tests/output/normal.png.pdf differ