From 62a70f90c49cf7714c960186eb063ad55333e6f3 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 21 Mar 2016 15:00:20 -0700 Subject: Remove FX_WORD in favor of uint16_t. It isn't buying us anthing, and it looks strange in a struct when other uint types are already present. R=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1821043003 . --- core/fpdfapi/fpdf_cmaps/cmap_int.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/fpdfapi/fpdf_cmaps/cmap_int.h') diff --git a/core/fpdfapi/fpdf_cmaps/cmap_int.h b/core/fpdfapi/fpdf_cmaps/cmap_int.h index a812d84f33..8dea4b4759 100644 --- a/core/fpdfapi/fpdf_cmaps/cmap_int.h +++ b/core/fpdfapi/fpdf_cmaps/cmap_int.h @@ -7,17 +7,17 @@ #ifndef CORE_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_ #define CORE_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_ -#include "core/include/fxcrt/fx_system.h" // For FX_WORD. +#include "core/include/fxcrt/fx_system.h" struct FXCMAP_CMap { enum MapType { None, Single, Range, Reverse }; const char* m_Name; MapType m_WordMapType; - const FX_WORD* m_pWordMap; + const uint16_t* m_pWordMap; int m_WordCount; MapType m_DWordMapType; - const FX_WORD* m_pDWordMap; + const uint16_t* m_pDWordMap; int m_DWordCount; int m_UseOffset; }; @@ -26,7 +26,7 @@ void FPDFAPI_FindEmbeddedCMap(const char* name, int charset, int coding, const FXCMAP_CMap*& pMap); -FX_WORD FPDFAPI_CIDFromCharCode(const FXCMAP_CMap* pMap, FX_DWORD charcode); -FX_DWORD FPDFAPI_CharCodeFromCID(const FXCMAP_CMap* pMap, FX_WORD cid); +uint16_t FPDFAPI_CIDFromCharCode(const FXCMAP_CMap* pMap, FX_DWORD charcode); +FX_DWORD FPDFAPI_CharCodeFromCID(const FXCMAP_CMap* pMap, uint16_t cid); #endif // CORE_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_ -- cgit v1.2.3