Reduce signed/unsigned comparison warnings

core/fpdftext/fpdf_text_int.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fpdftext/fpdf_text_int.h"
 
 #include <algorithm>
 #include <cctype>
@@ skipping 880 matching lines @@
       if (pPageObj->IsText()) {
         ProcessTextObject(pPageObj->AsText(), curFormMatrix, pObjectList, it);
       } else if (pPageObj->IsForm()) {
         ProcessFormObject(pPageObj->AsForm(), curFormMatrix);
       }
     }
   }
 }
 
 int CPDF_TextPage::GetCharWidth(uint32_t charCode, CPDF_Font* pFont) const {
-  if (charCode == -1)
+  if (charCode == CPDF_Font::kInvalidCharCode)
     return 0;
 
   if (int w = pFont->GetCharWidthF(charCode))
     return w;
 
   CFX_ByteString str;
   pFont->AppendChar(str, charCode);
   if (int w = pFont->GetStringWidth(str, 1))
     return w;
 
@@ skipping 230 matching lines @@
       return FPDFTEXT_MC_DONE;
     }
   }
   FX_STRSIZE nItems = actText.GetLength();
   if (nItems < 1)
     return FPDFTEXT_MC_PASS;
 
   CPDF_Font* pFont = pTextObj->GetFont();
   bExist = FALSE;
   for (FX_STRSIZE i = 0; i < nItems; i++) {
-    if (pFont->CharCodeFromUnicode(actText.GetAt(i)) != -1) {
+    if (pFont->CharCodeFromUnicode(actText.GetAt(i)) !=
+        CPDF_Font::kInvalidCharCode) {
       bExist = TRUE;
       break;
     }
   }
   if (!bExist)
     return FPDFTEXT_MC_PASS;
 
   bExist = FALSE;
   for (FX_STRSIZE i = 0; i < nItems; i++) {
     FX_WCHAR wChar = actText.GetAt(i);
@@ skipping 247 matching lines @@
       spacing += matrix.TransformDistance(charSpace);
     } else if (charSpace < -0.001) {
       spacing -= matrix.TransformDistance(FXSYS_fabs(charSpace));
     }
     spacing -= baseSpace;
     if (spacing && i > 0) {
       int last_width = 0;
       FX_FLOAT fontsize_h = pTextObj->m_TextState.GetFontSizeH();
       uint32_t space_charcode = pFont->CharCodeFromUnicode(' ');
       FX_FLOAT threshold = 0;
-      if (space_charcode != -1) {
+      if (space_charcode != CPDF_Font::kInvalidCharCode) {
         threshold = fontsize_h * pFont->GetCharWidthF(space_charcode) / 1000;
       }
       if (threshold > fontsize_h / 3) {
         threshold = 0;
       } else {
         threshold /= 2;
       }
       if (threshold == 0) {
         threshold = fontsize_h;
         int this_width = FXSYS_abs(GetCharWidth(item.m_CharCode, pFont));
         threshold = this_width > last_width ? (FX_FLOAT)this_width
                                             : (FX_FLOAT)last_width;
         threshold = _NormalizeThreshold(threshold);
         threshold = fontsize_h * threshold / 1000;
       }
       if (threshold && (spacing && spacing >= threshold)) {
         charinfo.m_Unicode = TEXT_BLANK_CHAR;
         charinfo.m_Flag = FPDFTEXT_CHAR_GENERATED;
         charinfo.m_pTextObj = pTextObj;
         charinfo.m_Index = m_TextBuf.GetLength();
         m_TempTextBuf.AppendChar(TEXT_BLANK_CHAR);
-        charinfo.m_CharCode = -1;
+        charinfo.m_CharCode = CPDF_Font::kInvalidCharCode;
         charinfo.m_Matrix.Copy(formMatrix);
         matrix.Transform(item.m_OriginX, item.m_OriginY, charinfo.m_OriginX,
                          charinfo.m_OriginY);
         charinfo.m_CharBox =
             CFX_FloatRect(charinfo.m_OriginX, charinfo.m_OriginY,
                           charinfo.m_OriginX, charinfo.m_OriginY);
         m_TempCharList.push_back(charinfo);
       }
-      if (item.m_CharCode == (uint32_t)-1) {
+      if (item.m_CharCode == CPDF_Font::kInvalidCharCode) {
         continue;
       }
     }
     spacing = 0;
     CFX_WideString wstrItem = pFont->UnicodeFromCharCode(item.m_CharCode);
     FX_BOOL bNoUnicode = FALSE;
     FX_WCHAR wChar = wstrItem.GetAt(0);
     if ((wstrItem.IsEmpty() || wChar == 0) && item.m_CharCode) {
       if (wstrItem.IsEmpty()) {
         wstrItem += (FX_WCHAR)item.m_CharCode;
@@ skipping 389 matching lines @@
   if (!m_TempCharList.empty()) {
     preChar = &m_TempCharList.back();
   } else if (!m_CharList.empty()) {
     preChar = &m_CharList.back();
   } else {
     return FALSE;
   }
   info.m_Index = m_TextBuf.GetLength();
   info.m_Unicode = unicode;
   info.m_pTextObj = NULL;
-  info.m_CharCode = -1;
+  info.m_CharCode = CPDF_Font::kInvalidCharCode;
   info.m_Flag = FPDFTEXT_CHAR_GENERATED;
   int preWidth = 0;
-  if (preChar->m_pTextObj && preChar->m_CharCode != (uint32_t)-1)
+  if (preChar->m_pTextObj && preChar->m_CharCode != -1) {
     preWidth =
         GetCharWidth(preChar->m_CharCode, preChar->m_pTextObj->GetFont());
+  }
 
   FX_FLOAT fFontSize = preChar->m_pTextObj ? preChar->m_pTextObj->GetFontSize()
                                            : preChar->m_CharBox.Height();
   if (!fFontSize)
     fFontSize = kDefaultFontSize;
 
   info.m_OriginX = preChar->m_OriginX + preWidth * (fFontSize) / 1000;
   info.m_OriginY = preChar->m_OriginY;
   info.m_CharBox = CFX_FloatRect(info.m_OriginX, info.m_OriginY, info.m_OriginX,
                                  info.m_OriginY);
@@ skipping 632 matching lines @@
   if (!m_bIsParsed || index < 0 || index >= m_LinkList.GetSize()) {
     return;
   }
   CPDF_LinkExt* link = NULL;
   link = m_LinkList.GetAt(index);
   if (!link) {
     return;
   }
   m_pTextPage->GetRectArray(link->m_Start, link->m_Count, rects);
 }