From 95d25e4585358c74ae91c2ed5e08099ebbfdf24c Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 26 Oct 2015 16:25:38 -0400 Subject: Revert "Make m_pShadingObj a CPDF_Stream instead of CPDF_Object." There appear to be a bunch of corpus tests which fail with this change such as FAILURE: shading1.pdf This reverts commit 85361b227ad6786d2aeef8409b79a8d077a26ee9. Make m_pShadingObj a CPDF_Stream instead of CPDF_Object. This object is required to be a stream and was being converted as such. With the new type checking this caused us to pass a nullptr where previously we'd have, incorrectly, cast a CPDF_Dictionary to a CPDF_Stream. This CL changes the m_pShadingObj to always be a CPDF_Stream. Then, we never go down the bad code path because we check if m_pShadingObj is nullptr earlier and bail out. BUG=chromium:547706 TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1414283003 . --- testing/resources/bug_547706.in | 43 ------------------------------- testing/resources/bug_547706.pdf | 55 ---------------------------------------- 2 files changed, 98 deletions(-) delete mode 100644 testing/resources/bug_547706.in delete mode 100644 testing/resources/bug_547706.pdf (limited to 'testing') diff --git a/testing/resources/bug_547706.in b/testing/resources/bug_547706.in deleted file mode 100644 index 4c31f19211..0000000000 --- a/testing/resources/bug_547706.in +++ /dev/null @@ -1,43 +0,0 @@ -{{header}} - -{{object 1 0}} -<< /Pages 2 0 R >> -endobj - -{{object 2 0}} -<< /Kids [ 3 0 R ] >> -endobj - -{{object 3 0}} -<< /Contents 4 0 R /Resources << /Pattern 6 0 R >>>> -endobj - -{{object 4 0}} -<< /Length 5 0 R >> -stream -/R9 scn -0 0 2479 3508 re -/R11 36 Tf -[(1)-12288.9(2)]TJ -endstream -endobj - -{{object 6 0}} -<< /R9 7 0 R >> -endobj - -{{object 7 0}} -<< /PatternType 2 /Shading 8 0 R >> -endobj - -{{object 8 0}} -<< /BitsPerComponent 16 /ColorSpace /DeviceRGB /ShadingType 5 >> -endobj - -{{xref}} -trailer << - /Root 1 0 R - /Size 9 ->> -{{startxref}} -%%EOF diff --git a/testing/resources/bug_547706.pdf b/testing/resources/bug_547706.pdf deleted file mode 100644 index 8003b3c488..0000000000 --- a/testing/resources/bug_547706.pdf +++ /dev/null @@ -1,55 +0,0 @@ -%PDF-1.7 -% ò¤ô - -1 0 obj -<< /Pages 2 0 R >> -endobj - -2 0 obj -<< /Kids [ 3 0 R ] >> -endobj - -3 0 obj -<< /Contents 4 0 R /Resources << /Pattern 6 0 R >>>> -endobj - -4 0 obj -<< /Length 5 0 R >> -stream -/R9 scn -0 0 2479 3508 re -/R11 36 Tf -[(1)-12288.9(2)]TJ -endstream -endobj - -6 0 obj -<< /R9 7 0 R >> -endobj - -7 0 obj -<< /PatternType 2 /Shading 8 0 R >> -endobj - -8 0 obj -<< /BitsPerComponent 16 /ColorSpace /DeviceRGB /ShadingType 5 >> -endobj - -xref -0 9 -0000000000 65535 f -0000000016 00000 n -0000000051 00000 n -0000000089 00000 n -0000000158 00000 n -0000000000 65535 f -0000000266 00000 n -0000000298 00000 n -0000000350 00000 n -trailer << - /Root 1 0 R - /Size 9 ->> -startxref -431 -%%EOF -- cgit v1.2.3