diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-10-08 15:51:29 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-10-08 15:51:29 -0700 |
| commit | d03ba8d1a5928e8f3f6bd7da063b53b0bc40abfd (patch) | |
| tree | 7736bff04e9169378df7c21bcb24af043ea70b29 /core/src/fpdfapi/fpdf_font/fpdf_font.cpp | |
| parent | 06f255ca4040f3d73cf09f1dbd63a3b167f6a4c1 (diff) | |
| download | pdfium-d03ba8d1a5928e8f3f6bd7da063b53b0bc40abfd.tar.xz | |
Fix a bunch of sign mismatch warnings.
Also remove some gotos and move code into an anonymous namespace.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1356373003 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_font/fpdf_font.cpp')
| -rw-r--r-- | core/src/fpdfapi/fpdf_font/fpdf_font.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp index 20c4082d4a..ed5809c8a8 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp @@ -38,7 +38,7 @@ class CFX_StockFontArray { FXSYS_memset(m_pStockFonts, 0, sizeof(m_pStockFonts)); } ~CFX_StockFontArray() { - for (int i = 0; i < FX_ArraySize(m_pStockFonts); i++) { + for (size_t i = 0; i < FX_ArraySize(m_pStockFonts); i++) { if (!m_pStockFonts[i]) continue; CPDF_Dictionary* pFontDict = m_pStockFonts[i]->GetFontDict(); @@ -593,7 +593,7 @@ static CFX_WideString _StringToWideString(const CFX_ByteStringC& str) { return result; } void CPDF_ToUnicodeMap::Load(CPDF_Stream* pStream) { - int CIDSet = 0; + CIDSet cid_set = CIDSET_UNKNOWN; CPDF_StreamAcc stream; stream.LoadAllData(pStream, FALSE); CPDF_SimpleParser parser(stream.GetData(), stream.GetSize()); @@ -681,20 +681,20 @@ void CPDF_ToUnicodeMap::Load(CPDF_Stream* pStream) { } } } else if (word == FX_BSTRC("/Adobe-Korea1-UCS2")) { - CIDSet = CIDSET_KOREA1; + cid_set = CIDSET_KOREA1; } else if (word == FX_BSTRC("/Adobe-Japan1-UCS2")) { - CIDSet = CIDSET_JAPAN1; + cid_set = CIDSET_JAPAN1; } else if (word == FX_BSTRC("/Adobe-CNS1-UCS2")) { - CIDSet = CIDSET_CNS1; + cid_set = CIDSET_CNS1; } else if (word == FX_BSTRC("/Adobe-GB1-UCS2")) { - CIDSet = CIDSET_GB1; + cid_set = CIDSET_GB1; } } - if (CIDSet) { + if (cid_set) { m_pBaseMap = CPDF_ModuleMgr::Get() ->GetPageModule() ->GetFontGlobals() - ->m_CMapManager.GetCID2UnicodeMap(CIDSet, FALSE); + ->m_CMapManager.GetCID2UnicodeMap(cid_set, FALSE); } else { m_pBaseMap = NULL; } |