From 46c8b1e3202ab5ae3663141dc25bec3b4360322e Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 25 Mar 2016 13:42:34 -0700 Subject: Replace CFX_DWordArray with CFX_ArrayTemplate. First step to getting rid of FX_DWORD. R=ochang@chromium.org Review URL: https://codereview.chromium.org/1832113003 . --- core/fpdfapi/fpdf_font/cpdf_cidfont.cpp | 2 +- core/fpdfapi/fpdf_font/cpdf_cidfont.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'core/fpdfapi/fpdf_font') diff --git a/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp b/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp index d528017779..956046c3be 100644 --- a/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp +++ b/core/fpdfapi/fpdf_font/cpdf_cidfont.cpp @@ -812,7 +812,7 @@ void CPDF_CIDFont::LoadSubstFont() { g_CharsetCPs[m_Charset], IsVertWriting()); } void CPDF_CIDFont::LoadMetricsArray(CPDF_Array* pArray, - CFX_DWordArray& result, + CFX_ArrayTemplate& result, int nElements) { int width_status = 0; int iCurElement = 0; diff --git a/core/fpdfapi/fpdf_font/cpdf_cidfont.h b/core/fpdfapi/fpdf_font/cpdf_cidfont.h index 6ff7c825d2..6405d2c342 100644 --- a/core/fpdfapi/fpdf_font/cpdf_cidfont.h +++ b/core/fpdfapi/fpdf_font/cpdf_cidfont.h @@ -63,7 +63,7 @@ class CPDF_CIDFont : public CPDF_Font { protected: int GetGlyphIndex(FX_DWORD unicodeb, FX_BOOL* pVertGlyph); void LoadMetricsArray(CPDF_Array* pArray, - CFX_DWordArray& result, + CFX_ArrayTemplate& result, int nElements); void LoadSubstFont(); FX_WCHAR GetUnicodeFromCharCode(FX_DWORD charcode) const; @@ -78,10 +78,10 @@ class CPDF_CIDFont : public CPDF_Font { uint16_t m_DefaultWidth; uint16_t* m_pAnsiWidths; FX_SMALL_RECT m_CharBBox[256]; - CFX_DWordArray m_WidthList; + CFX_ArrayTemplate m_WidthList; short m_DefaultVY; short m_DefaultW1; - CFX_DWordArray m_VertMetrics; + CFX_ArrayTemplate m_VertMetrics; FX_BOOL m_bAdobeCourierStd; CFX_CTTGSUBTable* m_pTTGSUBTable; }; -- cgit v1.2.3