From 6f3b76b6c1f72aa8fad17680937b726844d7cd8c Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Fri, 4 Jan 2019 17:59:48 -0500 Subject: Fix image-streams.pdf in test suite Some of the images were supposed to have no filter, but somewhere along the line, they ended up with /FlateDecode, most likely because qpdf rewrote the file without having --compress-streams=n specified. If this error is repeated, it will cause a test failure. --- qpdf/qtest/qpdf/image-streams-none.out | 6 ++-- qpdf/qtest/qpdf/image-streams.pdf | Bin 1436659 -> 2970696 bytes qpdf/qtest/qpdf/json-image-streams-all.out | 40 ++++++++------------- qpdf/qtest/qpdf/json-image-streams-specialized.out | 40 ++++++++------------- qpdf/qtest/qpdf/json-image-streams.out | 40 ++++++++------------- 5 files changed, 45 insertions(+), 81 deletions(-) diff --git a/qpdf/qtest/qpdf/image-streams-none.out b/qpdf/qtest/qpdf/image-streams-none.out index 8faed282..5016a4ee 100644 --- a/qpdf/qtest/qpdf/image-streams-none.out +++ b/qpdf/qtest/qpdf/image-streams-none.out @@ -1,17 +1,17 @@ page 1 -filter: /FlateDecode, color space: /DeviceCMYK +filter: null, color space: /DeviceCMYK page 2 filter: /DCTDecode, color space: /DeviceCMYK page 3 filter: /RunLengthDecode, color space: /DeviceCMYK page 4 -filter: /FlateDecode, color space: /DeviceRGB +filter: null, color space: /DeviceRGB page 5 filter: /DCTDecode, color space: /DeviceRGB page 6 filter: /RunLengthDecode, color space: /DeviceRGB page 7 -filter: /FlateDecode, color space: /DeviceGray +filter: null, color space: /DeviceGray page 8 filter: /DCTDecode, color space: /DeviceGray page 9 diff --git a/qpdf/qtest/qpdf/image-streams.pdf b/qpdf/qtest/qpdf/image-streams.pdf index 552439c2..bcc40f2e 100644 Binary files a/qpdf/qtest/qpdf/image-streams.pdf and b/qpdf/qtest/qpdf/image-streams.pdf differ diff --git a/qpdf/qtest/qpdf/json-image-streams-all.out b/qpdf/qtest/qpdf/json-image-streams-all.out index 81606881..40be701d 100644 --- a/qpdf/qtest/qpdf/json-image-streams-all.out +++ b/qpdf/qtest/qpdf/json-image-streams-all.out @@ -58,8 +58,7 @@ "/Type": "/Page" }, "12 0 R": { - "/Filter": "/FlateDecode", - "/Length": 97 + "/Length": 95 }, "13 0 R": { "/BaseFont": "/Helvetica", @@ -71,16 +70,14 @@ "14 0 R": { "/BitsPerComponent": 8, "/ColorSpace": "/DeviceCMYK", - "/Filter": "/FlateDecode", "/Height": 480, - "/Length": 847, + "/Length": 768000, "/Subtype": "/Image", "/Type": "/XObject", "/Width": 400 }, "15 0 R": { - "/Filter": "/FlateDecode", - "/Length": 102 + "/Length": 101 }, "16 0 R": { "/BitsPerComponent": 8, @@ -93,8 +90,7 @@ "/Width": 400 }, "17 0 R": { - "/Filter": "/FlateDecode", - "/Length": 108 + "/Length": 107 }, "18 0 R": { "/BitsPerComponent": 8, @@ -107,8 +103,7 @@ "/Width": 400 }, "19 0 R": { - "/Filter": "/FlateDecode", - "/Length": 96 + "/Length": 94 }, "2 0 R": { "/Count": 9, @@ -128,16 +123,14 @@ "20 0 R": { "/BitsPerComponent": 8, "/ColorSpace": "/DeviceRGB", - "/Filter": "/FlateDecode", "/Height": 480, - "/Length": 645, + "/Length": 576000, "/Subtype": "/Image", "/Type": "/XObject", "/Width": 400 }, "21 0 R": { - "/Filter": "/FlateDecode", - "/Length": 99 + "/Length": 100 }, "22 0 R": { "/BitsPerComponent": 8, @@ -150,7 +143,6 @@ "/Width": 400 }, "23 0 R": { - "/Filter": "/FlateDecode", "/Length": 106 }, "24 0 R": { @@ -164,21 +156,18 @@ "/Width": 400 }, "25 0 R": { - "/Filter": "/FlateDecode", - "/Length": 97 + "/Length": 95 }, "26 0 R": { "/BitsPerComponent": 8, "/ColorSpace": "/DeviceGray", - "/Filter": "/FlateDecode", "/Height": 480, - "/Length": 221, + "/Length": 192000, "/Subtype": "/Image", "/Type": "/XObject", "/Width": 400 }, "27 0 R": { - "/Filter": "/FlateDecode", "/Length": 101 }, "28 0 R": { @@ -192,8 +181,7 @@ "/Width": 400 }, "29 0 R": { - "/Filter": "/FlateDecode", - "/Length": 108 + "/Length": 107 }, "3 0 R": { "/Contents": "12 0 R", @@ -376,7 +364,7 @@ "trailer": { "/ID": [ "S¶Ł”łîð\u000e¢¬\u0007}_)\u0012¶", - "S¶Ł”łîð\u000e¢¬\u0007}_)\u0012¶" + "'+“‰¤V2«PP ç`m\"\u001d" ], "/Root": "1 0 R", "/Size": 31 @@ -397,7 +385,7 @@ null ], "filter": [ - "/FlateDecode" + null ], "filterable": true, "height": 480, @@ -475,7 +463,7 @@ null ], "filter": [ - "/FlateDecode" + null ], "filterable": true, "height": 480, @@ -553,7 +541,7 @@ null ], "filter": [ - "/FlateDecode" + null ], "filterable": true, "height": 480, diff --git a/qpdf/qtest/qpdf/json-image-streams-specialized.out b/qpdf/qtest/qpdf/json-image-streams-specialized.out index d97d55f1..2b1dc4dd 100644 --- a/qpdf/qtest/qpdf/json-image-streams-specialized.out +++ b/qpdf/qtest/qpdf/json-image-streams-specialized.out @@ -58,8 +58,7 @@ "/Type": "/Page" }, "12 0 R": { - "/Filter": "/FlateDecode", - "/Length": 97 + "/Length": 95 }, "13 0 R": { "/BaseFont": "/Helvetica", @@ -71,16 +70,14 @@ "14 0 R": { "/BitsPerComponent": 8, "/ColorSpace": "/DeviceCMYK", - "/Filter": "/FlateDecode", "/Height": 480, - "/Length": 847, + "/Length": 768000, "/Subtype": "/Image", "/Type": "/XObject", "/Width": 400 }, "15 0 R": { - "/Filter": "/FlateDecode", - "/Length": 102 + "/Length": 101 }, "16 0 R": { "/BitsPerComponent": 8, @@ -93,8 +90,7 @@ "/Width": 400 }, "17 0 R": { - "/Filter": "/FlateDecode", - "/Length": 108 + "/Length": 107 }, "18 0 R": { "/BitsPerComponent": 8, @@ -107,8 +103,7 @@ "/Width": 400 }, "19 0 R": { - "/Filter": "/FlateDecode", - "/Length": 96 + "/Length": 94 }, "2 0 R": { "/Count": 9, @@ -128,16 +123,14 @@ "20 0 R": { "/BitsPerComponent": 8, "/ColorSpace": "/DeviceRGB", - "/Filter": "/FlateDecode", "/Height": 480, - "/Length": 645, + "/Length": 576000, "/Subtype": "/Image", "/Type": "/XObject", "/Width": 400 }, "21 0 R": { - "/Filter": "/FlateDecode", - "/Length": 99 + "/Length": 100 }, "22 0 R": { "/BitsPerComponent": 8, @@ -150,7 +143,6 @@ "/Width": 400 }, "23 0 R": { - "/Filter": "/FlateDecode", "/Length": 106 }, "24 0 R": { @@ -164,21 +156,18 @@ "/Width": 400 }, "25 0 R": { - "/Filter": "/FlateDecode", - "/Length": 97 + "/Length": 95 }, "26 0 R": { "/BitsPerComponent": 8, "/ColorSpace": "/DeviceGray", - "/Filter": "/FlateDecode", "/Height": 480, - "/Length": 221, + "/Length": 192000, "/Subtype": "/Image", "/Type": "/XObject", "/Width": 400 }, "27 0 R": { - "/Filter": "/FlateDecode", "/Length": 101 }, "28 0 R": { @@ -192,8 +181,7 @@ "/Width": 400 }, "29 0 R": { - "/Filter": "/FlateDecode", - "/Length": 108 + "/Length": 107 }, "3 0 R": { "/Contents": "12 0 R", @@ -376,7 +364,7 @@ "trailer": { "/ID": [ "S¶Ł”łîð\u000e¢¬\u0007}_)\u0012¶", - "S¶Ł”łîð\u000e¢¬\u0007}_)\u0012¶" + "'+“‰¤V2«PP ç`m\"\u001d" ], "/Root": "1 0 R", "/Size": 31 @@ -397,7 +385,7 @@ null ], "filter": [ - "/FlateDecode" + null ], "filterable": true, "height": 480, @@ -475,7 +463,7 @@ null ], "filter": [ - "/FlateDecode" + null ], "filterable": true, "height": 480, @@ -553,7 +541,7 @@ null ], "filter": [ - "/FlateDecode" + null ], "filterable": true, "height": 480, diff --git a/qpdf/qtest/qpdf/json-image-streams.out b/qpdf/qtest/qpdf/json-image-streams.out index 9a0614da..e7bec295 100644 --- a/qpdf/qtest/qpdf/json-image-streams.out +++ b/qpdf/qtest/qpdf/json-image-streams.out @@ -58,8 +58,7 @@ "/Type": "/Page" }, "12 0 R": { - "/Filter": "/FlateDecode", - "/Length": 97 + "/Length": 95 }, "13 0 R": { "/BaseFont": "/Helvetica", @@ -71,16 +70,14 @@ "14 0 R": { "/BitsPerComponent": 8, "/ColorSpace": "/DeviceCMYK", - "/Filter": "/FlateDecode", "/Height": 480, - "/Length": 847, + "/Length": 768000, "/Subtype": "/Image", "/Type": "/XObject", "/Width": 400 }, "15 0 R": { - "/Filter": "/FlateDecode", - "/Length": 102 + "/Length": 101 }, "16 0 R": { "/BitsPerComponent": 8, @@ -93,8 +90,7 @@ "/Width": 400 }, "17 0 R": { - "/Filter": "/FlateDecode", - "/Length": 108 + "/Length": 107 }, "18 0 R": { "/BitsPerComponent": 8, @@ -107,8 +103,7 @@ "/Width": 400 }, "19 0 R": { - "/Filter": "/FlateDecode", - "/Length": 96 + "/Length": 94 }, "2 0 R": { "/Count": 9, @@ -128,16 +123,14 @@ "20 0 R": { "/BitsPerComponent": 8, "/ColorSpace": "/DeviceRGB", - "/Filter": "/FlateDecode", "/Height": 480, - "/Length": 645, + "/Length": 576000, "/Subtype": "/Image", "/Type": "/XObject", "/Width": 400 }, "21 0 R": { - "/Filter": "/FlateDecode", - "/Length": 99 + "/Length": 100 }, "22 0 R": { "/BitsPerComponent": 8, @@ -150,7 +143,6 @@ "/Width": 400 }, "23 0 R": { - "/Filter": "/FlateDecode", "/Length": 106 }, "24 0 R": { @@ -164,21 +156,18 @@ "/Width": 400 }, "25 0 R": { - "/Filter": "/FlateDecode", - "/Length": 97 + "/Length": 95 }, "26 0 R": { "/BitsPerComponent": 8, "/ColorSpace": "/DeviceGray", - "/Filter": "/FlateDecode", "/Height": 480, - "/Length": 221, + "/Length": 192000, "/Subtype": "/Image", "/Type": "/XObject", "/Width": 400 }, "27 0 R": { - "/Filter": "/FlateDecode", "/Length": 101 }, "28 0 R": { @@ -192,8 +181,7 @@ "/Width": 400 }, "29 0 R": { - "/Filter": "/FlateDecode", - "/Length": 108 + "/Length": 107 }, "3 0 R": { "/Contents": "12 0 R", @@ -376,7 +364,7 @@ "trailer": { "/ID": [ "S¶Ł”łîð\u000e¢¬\u0007}_)\u0012¶", - "S¶Ł”łîð\u000e¢¬\u0007}_)\u0012¶" + "'+“‰¤V2«PP ç`m\"\u001d" ], "/Root": "1 0 R", "/Size": 31 @@ -397,7 +385,7 @@ null ], "filter": [ - "/FlateDecode" + null ], "filterable": true, "height": 480, @@ -475,7 +463,7 @@ null ], "filter": [ - "/FlateDecode" + null ], "filterable": true, "height": 480, @@ -553,7 +541,7 @@ null ], "filter": [ - "/FlateDecode" + null ], "filterable": true, "height": 480, -- cgit v1.2.3-54-g00ecf