From 710c909117da4297e5a9508bedb306fc5c49eb36 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 21 Oct 2015 15:46:10 -0400 Subject: Merge to XFA: Add type cast definitions for CPDF_Name. This Cl adds ToName, CPDF_Object::AsName and CPDF_Object::IsName and updates the src to use them as needed. BUG=pdfium:201 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1417823005 . (cherry picked from commit 1c77edb7b34e03787605b7965784cea38ef9f1d7) Review URL: https://codereview.chromium.org/1417033004 . --- core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp') diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index c3029e0091..79b4bba162 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -476,7 +476,7 @@ FX_BOOL CPDF_DIBSource::LoadColorInfo(CPDF_Dictionary* pFormResources, CPDF_Object* pFilter = m_pDict->GetElementValue(FX_BSTRC("Filter")); if (pFilter) { CFX_ByteString filter; - if (pFilter->GetType() == PDFOBJ_NAME) { + if (pFilter->IsName()) { filter = pFilter->GetString(); if (filter == FX_BSTRC("JPXDecode")) { m_bDoBpcCheck = FALSE; @@ -514,7 +514,7 @@ FX_BOOL CPDF_DIBSource::LoadColorInfo(CPDF_Dictionary* pFormResources, } m_Family = m_pColorSpace->GetFamily(); m_nComponents = m_pColorSpace->CountComponents(); - if (m_Family == PDFCS_ICCBASED && pCSObj->GetType() == PDFOBJ_NAME) { + if (m_Family == PDFCS_ICCBASED && pCSObj->IsName()) { CFX_ByteString cs = pCSObj->GetString(); if (cs == FX_BSTRC("DeviceGray")) { m_nComponents = 1; @@ -939,7 +939,7 @@ void CPDF_DIBSource::ValidateDictParam() { m_bpc = m_bpc_orig; CPDF_Object* pFilter = m_pDict->GetElementValue(FX_BSTRC("Filter")); if (pFilter) { - if (pFilter->GetType() == PDFOBJ_NAME) { + if (pFilter->IsName()) { CFX_ByteString filter = pFilter->GetString(); if (filter == FX_BSTRC("CCITTFaxDecode") || filter == FX_BSTRC("JBIG2Decode")) { -- cgit v1.2.3