From 8e5cd19d174f259bfda5f7a9699b08fdc4289b56 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 26 Jan 2016 13:20:26 -0800 Subject: Merge to XFA: War on #defines, part 1. Contains additional XFA-specific changes. Original Review URL: https://codereview.chromium.org/1632143002 . (cherry picked from commit 66a9dc9dd65ed2b9c7ede448d046b770140f16d5) R=thestig@chromium.org Review URL: https://codereview.chromium.org/1636503006 . --- fpdfsdk/src/fpdf_flatten.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'fpdfsdk/src/fpdf_flatten.cpp') diff --git a/fpdfsdk/src/fpdf_flatten.cpp b/fpdfsdk/src/fpdf_flatten.cpp index c81955d6ca..c59b6edc4d 100644 --- a/fpdfsdk/src/fpdf_flatten.cpp +++ b/fpdfsdk/src/fpdf_flatten.cpp @@ -207,11 +207,10 @@ void SetPageContents(CFX_ByteString key, return; } - int iType = pContentsObj->GetType(); CPDF_Array* pContentsArray = NULL; - switch (iType) { - case PDFOBJ_STREAM: { + switch (pContentsObj->GetType()) { + case CPDF_Object::STREAM: { pContentsArray = new CPDF_Array; CPDF_Stream* pContents = pContentsObj->AsStream(); FX_DWORD dwObjNum = pDocument->AddIndirectObject(pContents); @@ -227,7 +226,7 @@ void SetPageContents(CFX_ByteString key, break; } - case PDFOBJ_ARRAY: { + case CPDF_Object::ARRAY: { pContentsArray = pContentsObj->AsArray(); break; } -- cgit v1.2.3