Reduce signed/unsigned comparison warnings

core/fpdfapi/fpdf_page/cpdf_textobject.cpp

 // Copyright 2016 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/fpdfapi/fpdf_page/include/cpdf_textobject.h"
 
 #include "core/fpdfapi/fpdf_font/cpdf_cidfont.h"
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
@@ skipping 10 matching lines @@
     FX_Free(m_pCharCodes);
   }
   FX_Free(m_pCharPos);
 }
 
 void CPDF_TextObject::GetItemInfo(int index, CPDF_TextObjectItem* pInfo) const {
   pInfo->m_CharCode =
       m_nChars == 1 ? (FX_DWORD)(uintptr_t)m_pCharCodes : m_pCharCodes[index];
   pInfo->m_OriginX = index ? m_pCharPos[index - 1] : 0;
   pInfo->m_OriginY = 0;
-  if (pInfo->m_CharCode == -1) {
+  if (pInfo->m_CharCode == CPDF_Font::kInvalidCharCode) {
     return;
   }
   CPDF_Font* pFont = m_TextState.GetFont();
   if (!pFont->IsCIDFont()) {
     return;
   }
   if (!pFont->AsCIDFont()->IsVertWriting()) {
     return;
   }
   uint16_t CID = pFont->AsCIDFont()->CIDFromCharCode(pInfo->m_CharCode);
   pInfo->m_OriginY = pInfo->m_OriginX;
   pInfo->m_OriginX = 0;
   short vx, vy;
   pFont->AsCIDFont()->GetVertOrigin(CID, vx, vy);
   FX_FLOAT fontsize = m_TextState.GetFontSize();
   pInfo->m_OriginX -= fontsize * vx / 1000;
   pInfo->m_OriginY -= fontsize * vy / 1000;
 }
 
 int CPDF_TextObject::CountChars() const {
   if (m_nChars == 1) {
     return 1;
   }
   int count = 0;
   for (int i = 0; i < m_nChars; ++i)
-    if (m_pCharCodes[i] != (FX_DWORD)-1) {
+    if (m_pCharCodes[i] != CPDF_Font::kInvalidCharCode) {
       ++count;
     }
   return count;
 }
 
 void CPDF_TextObject::GetCharInfo(int index,
                                   FX_DWORD& charcode,
                                   FX_FLOAT& kerning) const {
   if (m_nChars == 1) {
     charcode = (FX_DWORD)(uintptr_t)m_pCharCodes;
     kerning = 0;
     return;
   }
   int count = 0;
   for (int i = 0; i < m_nChars; ++i) {
-    if (m_pCharCodes[i] != (FX_DWORD)-1) {
+    if (m_pCharCodes[i] != CPDF_Font::kInvalidCharCode) {
       if (count == index) {
         charcode = m_pCharCodes[i];
-        if (i == m_nChars - 1 || m_pCharCodes[i + 1] != (FX_DWORD)-1) {
+        if (i == m_nChars - 1 ||
+            m_pCharCodes[i + 1] != CPDF_Font::kInvalidCharCode) {
           kerning = 0;
         } else {
           kerning = m_pCharPos[i];
         }
         return;
       }
       ++count;
     }
   }
 }
 
 void CPDF_TextObject::GetCharInfo(int index, CPDF_TextObjectItem* pInfo) const {
   if (m_nChars == 1) {
     GetItemInfo(0, pInfo);
     return;
   }
   int count = 0;
   for (int i = 0; i < m_nChars; ++i) {
     FX_DWORD charcode = m_pCharCodes[i];
-    if (charcode == (FX_DWORD)-1) {
+    if (charcode == CPDF_Font::kInvalidCharCode) {
       continue;
     }
     if (count == index) {
       GetItemInfo(i, pInfo);
       break;
     }
     ++count;
   }
 }
 
@@ skipping 42 matching lines @@
     m_pCharPos = FX_Alloc(FX_FLOAT, m_nChars - 1);
     int index = 0;
     for (int i = 0; i < nsegs; ++i) {
       const FX_CHAR* segment = pStrs[i];
       int offset = 0, len = pStrs[i].GetLength();
       while (offset < len) {
         m_pCharCodes[index++] = pFont->GetNextChar(segment, len, offset);
       }
       if (i != nsegs - 1) {
         m_pCharPos[index - 1] = pKerning[i];
-        m_pCharCodes[index++] = (FX_DWORD)-1;
+        m_pCharCodes[index++] = CPDF_Font::kInvalidCharCode;
       }
     }
   } else {
     int offset = 0;
     m_pCharCodes = (FX_DWORD*)(uintptr_t)pFont->GetNextChar(
         pStrs[0], pStrs[0].GetLength(), offset);
   }
 }
 
 void CPDF_TextObject::SetText(const CFX_ByteString& str) {
@@ skipping 29 matching lines @@
   FX_BOOL bVertWriting = FALSE;
   CPDF_CIDFont* pCIDFont = pFont->AsCIDFont();
   if (pCIDFont) {
     bVertWriting = pCIDFont->IsVertWriting();
   }
   FX_FLOAT fontsize = m_TextState.GetFontSize();
   for (int i = 0; i < m_nChars; ++i) {
     FX_DWORD charcode =
         m_nChars == 1 ? (FX_DWORD)(uintptr_t)m_pCharCodes : m_pCharCodes[i];
     if (i > 0) {
-      if (charcode == (FX_DWORD)-1) {
+      if (charcode == CPDF_Font::kInvalidCharCode) {
         curpos -= (m_pCharPos[i - 1] * fontsize) / 1000;
         continue;
       }
       m_pCharPos[i - 1] = curpos;
     }
     FX_RECT char_rect = pFont->GetCharBBox(charcode, level);
     FX_FLOAT charwidth;
     if (!bVertWriting) {
       if (min_y > char_rect.top) {
         min_y = (FX_FLOAT)char_rect.top;
@@ skipping 119 matching lines @@
 void CPDF_TextObject::SetPosition(FX_FLOAT x, FX_FLOAT y) {
   FX_FLOAT dx = x - m_PosX;
   FX_FLOAT dy = y - m_PosY;
   m_PosX = x;
   m_PosY = y;
   m_Left += dx;
   m_Right += dx;
   m_Top += dy;
   m_Bottom += dy;
 }