From 9494421208674d2c57a9f864d342f017c0b20902 Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Mon, 17 Aug 2015 12:20:05 -0700
Subject: Fix more sign comparison errors.

R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1290383003 .
---
 core/include/fpdfapi/fpdf_resource.h |  2 +-
 core/src/fpdfdoc/doc_ap.cpp          | 37 ++++++++++++++++++++----------------
 2 files changed, 22 insertions(+), 17 deletions(-)

(limited to 'core')

diff --git a/core/include/fpdfapi/fpdf_resource.h b/core/include/fpdfapi/fpdf_resource.h
index 5b6f3498fe..d687c97b9c 100644
--- a/core/include/fpdfapi/fpdf_resource.h
+++ b/core/include/fpdfapi/fpdf_resource.h
@@ -21,7 +21,6 @@ class CPDF_CMap;
 class CPDF_Color;
 class CPDF_ColorSpace;
 class CPDF_Face;
-class CPDF_Font;
 class CPDF_FontEncoding;
 class CPDF_Form;
 class CPDF_Function;
@@ -101,6 +100,7 @@ class CPDF_Font {
                                 CPDF_Dictionary* pFontDict);
   static CPDF_Font* GetStockFont(CPDF_Document* pDoc,
                                  const CFX_ByteStringC& fontname);
+  static const FX_DWORD kInvalidCharCode = static_cast<FX_DWORD>(-1);
 
   virtual ~CPDF_Font();
 
diff --git a/core/src/fpdfdoc/doc_ap.cpp b/core/src/fpdfdoc/doc_ap.cpp
index cffaad9900..f9bb3a7641 100644
--- a/core/src/fpdfdoc/doc_ap.cpp
+++ b/core/src/fpdfdoc/doc_ap.cpp
@@ -133,7 +133,7 @@ int32_t CPVT_Provider::GetCharWidth(int32_t nFontIndex,
                                     int32_t nWordStyle) {
   if (CPDF_Font* pPDFFont = m_pFontMap->GetPDFFont(nFontIndex)) {
     FX_DWORD charcode = pPDFFont->CharCodeFromUnicode(word);
-    if (charcode != -1) {
+    if (charcode != CPDF_Font::kInvalidCharCode) {
       return pPDFFont->GetCharWidthF(charcode);
     }
   }
@@ -155,14 +155,15 @@ int32_t CPVT_Provider::GetWordFontIndex(FX_WORD word,
                                         int32_t charset,
                                         int32_t nFontIndex) {
   if (CPDF_Font* pDefFont = m_pFontMap->GetPDFFont(0)) {
-    if (pDefFont->CharCodeFromUnicode(word) != -1) {
+    if (pDefFont->CharCodeFromUnicode(word) != CPDF_Font::kInvalidCharCode) {
       return 0;
     }
   }
-  if (CPDF_Font* pSysFont = m_pFontMap->GetPDFFont(1))
-    if (pSysFont->CharCodeFromUnicode(word) != -1) {
+  if (CPDF_Font* pSysFont = m_pFontMap->GetPDFFont(1)) {
+    if (pSysFont->CharCodeFromUnicode(word) != CPDF_Font::kInvalidCharCode) {
       return 1;
     }
+  }
   return -1;
 }
 FX_BOOL CPVT_Provider::IsLatinWord(FX_WORD word) {
@@ -175,6 +176,7 @@ FX_BOOL CPVT_Provider::IsLatinWord(FX_WORD word) {
 int32_t CPVT_Provider::GetDefaultFontIndex() {
   return 0;
 }
+
 static CFX_ByteString GetPDFWordString(IPVT_FontMap* pFontMap,
                                        int32_t nFontIndex,
                                        FX_WORD Word,
@@ -182,23 +184,26 @@ static CFX_ByteString GetPDFWordString(IPVT_FontMap* pFontMap,
   CFX_ByteString sWord;
   if (SubWord > 0) {
     sWord.Format("%c", SubWord);
-  } else {
-    if (pFontMap) {
-      if (CPDF_Font* pPDFFont = pFontMap->GetPDFFont(nFontIndex)) {
-        if (pPDFFont->GetBaseFont().Compare("Symbol") == 0 ||
-            pPDFFont->GetBaseFont().Compare("ZapfDingbats") == 0) {
-          sWord.Format("%c", Word);
-        } else {
-          FX_DWORD dwCharCode = pPDFFont->CharCodeFromUnicode(Word);
-          if (dwCharCode != -1) {
-            pPDFFont->AppendChar(sWord, dwCharCode);
-          }
-        }
+    return sWord;
+  }
+
+  if (!pFontMap)
+    return sWord;
+
+  if (CPDF_Font* pPDFFont = pFontMap->GetPDFFont(nFontIndex)) {
+    if (pPDFFont->GetBaseFont().Compare("Symbol") == 0 ||
+        pPDFFont->GetBaseFont().Compare("ZapfDingbats") == 0) {
+      sWord.Format("%c", Word);
+    } else {
+      FX_DWORD dwCharCode = pPDFFont->CharCodeFromUnicode(Word);
+      if (dwCharCode != CPDF_Font::kInvalidCharCode) {
+        pPDFFont->AppendChar(sWord, dwCharCode);
       }
     }
   }
   return sWord;
 }
+
 static CFX_ByteString GetWordRenderString(const CFX_ByteString& strWords) {
   if (strWords.GetLength() > 0) {
     return PDF_EncodeString(strWords) + " Tj\n";
-- 
cgit v1.2.3