From 9b76113ae4567eb998618d049afde26d3f0175d5 Mon Sep 17 00:00:00 2001 From: Wei Li Date: Fri, 29 Jan 2016 15:44:20 -0800 Subject: Merge to XFA: Member function name refactoring This is needed by Cl 1634373003 as the name collision with virtual functions will be shown as warnings on Linux. Also, it is better to use different names for different cases. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1644633003 . (cherry picked from commit d45e7a51904164fb22049f0a7a80d2a94c06936b) Review URL: https://codereview.chromium.org/1648233002 . --- fpdfsdk/src/pdfwindow/PWL_Icon.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'fpdfsdk/src/pdfwindow/PWL_Icon.cpp') diff --git a/fpdfsdk/src/pdfwindow/PWL_Icon.cpp b/fpdfsdk/src/pdfwindow/PWL_Icon.cpp index 6afd76c5c6..56c22d1bbd 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Icon.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Icon.cpp @@ -60,7 +60,7 @@ void CPWL_Image::GetImageSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight) { if (m_pPDFStream) { if (CPDF_Dictionary* pDict = m_pPDFStream->GetDict()) { - CPDF_Rect rect = pDict->GetRect("BBox"); + CPDF_Rect rect = pDict->GetRectBy("BBox"); fWidth = rect.right - rect.left; fHeight = rect.top - rect.bottom; @@ -71,7 +71,7 @@ void CPWL_Image::GetImageSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight) { CFX_Matrix CPWL_Image::GetImageMatrix() { if (m_pPDFStream) { if (CPDF_Dictionary* pDict = m_pPDFStream->GetDict()) { - return pDict->GetMatrix("Matrix"); + return pDict->GetMatrixBy("Matrix"); } } @@ -84,7 +84,7 @@ CFX_ByteString CPWL_Image::GetImageAlias() { if (m_pPDFStream) { if (CPDF_Dictionary* pDict = m_pPDFStream->GetDict()) { - return pDict->GetString("Name"); + return pDict->GetStringBy("Name"); } } @@ -128,13 +128,13 @@ void CPWL_Icon::GetIconPosition(FX_FLOAT& fLeft, FX_FLOAT& fBottom) { fLeft = 0.0f; fBottom = 0.0f; CPDF_Array* pA = - m_pIconFit->m_pDict ? m_pIconFit->m_pDict->GetArray("A") : NULL; + m_pIconFit->m_pDict ? m_pIconFit->m_pDict->GetArrayBy("A") : NULL; if (pA) { FX_DWORD dwCount = pA->GetCount(); if (dwCount > 0) - fLeft = pA->GetNumber(0); + fLeft = pA->GetNumberAt(0); if (dwCount > 1) - fBottom = pA->GetNumber(1); + fBottom = pA->GetNumberAt(1); } } else { fLeft = 0.0f; -- cgit v1.2.3