Code change to avoid signed/unsigned mismatch warnings

core/fxge/ge/fx_ge_text.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/fxge/ge/fx_text_int.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
@@ skipping 1518 matching lines @@
   const CFX_SubstFont* pSubstFont = pFont->GetSubstFont();
   if (pSubstFont) {
     bUseCJKSubFont = pSubstFont->m_bSubstOfCJK && bFontStyle;
     int skew = 0;
     if (bUseCJKSubFont) {
       skew = pSubstFont->m_bItlicCJK ? -15 : 0;
     } else {
       skew = pSubstFont->m_ItalicAngle;
     }
     if (skew) {
-      skew = skew <= -ANGLESKEW_ARRAY_SIZE ? -58 : -g_AngleSkew[-skew];
-      if (pFont->IsVertical()) {
+      // skew is nonpositive so -skew is used as the index.
+      skew = -skew <= static_cast<int>(ANGLESKEW_ARRAY_SIZE)
+                 ? -58
+                 : -g_AngleSkew[-skew];
+      if (pFont->IsVertical())
         ft_matrix.yx += ft_matrix.yy * skew / 100;
-      } else {
+      else
         ft_matrix.xy += -ft_matrix.xx * skew / 100;
-      }
     }
     if (pSubstFont->m_SubstFlags & FXFONT_SUBST_MM) {
       pFont->AdjustMMParams(glyph_index, dest_width,
                             pFont->GetSubstFont()->m_Weight);
     }
   }
   ScopedFontTransform scoped_transform(m_Face, &ft_matrix);
   int load_flags = (m_Face->face_flags & FT_FACE_FLAG_SFNT)
                        ? FXFT_LOAD_NO_BITMAP
                        : (FXFT_LOAD_NO_BITMAP | FT_LOAD_NO_HINTING);
@@ skipping 12 matching lines @@
     }
   }
   int weight = 0;
   if (bUseCJKSubFont) {
     weight = pSubstFont->m_WeightCJK;
   } else {
     weight = pSubstFont ? pSubstFont->m_Weight : 0;
   }
   if (pSubstFont && !(pSubstFont->m_SubstFlags & FXFONT_SUBST_MM) &&
       weight > 400) {
-    int index = (weight - 400) / 10;
-    if (index >= WEIGHTPOW_ARRAY_SIZE) {
+    uint32_t index = (weight - 400) / 10;
+    if (index >= WEIGHTPOW_ARRAY_SIZE)
       return NULL;
-    }
     int level = 0;
     if (pSubstFont->m_Charset == FXFONT_SHIFTJIS_CHARSET) {
       level =
           g_WeightPow_SHIFTJIS[index] * 2 *
           (FXSYS_abs((int)(ft_matrix.xx)) + FXSYS_abs((int)(ft_matrix.xy))) /
           36655;
     } else {
       level = g_WeightPow_11[index] * (FXSYS_abs((int)(ft_matrix.xx)) +
                                        FXSYS_abs((int)(ft_matrix.xy))) /
               36655;
@@ skipping 203 matching lines @@
 };
 CFX_PathData* CFX_Font::LoadGlyphPath(uint32_t glyph_index, int dest_width) {
   if (!m_Face) {
     return NULL;
   }
   FXFT_Set_Pixel_Sizes(m_Face, 0, 64);
   FXFT_Matrix ft_matrix = {65536, 0, 0, 65536};
   if (m_pSubstFont) {
     if (m_pSubstFont->m_ItalicAngle) {
       int skew = m_pSubstFont->m_ItalicAngle;
-      skew = skew <= -ANGLESKEW_ARRAY_SIZE ? -58 : -g_AngleSkew[-skew];
-      if (m_bVertical) {
+      // skew is nonpositive so -skew is used as the index.
+      skew = -skew <= static_cast<int>(ANGLESKEW_ARRAY_SIZE)
+                 ? -58
+                 : -g_AngleSkew[-skew];
+      if (m_bVertical)
         ft_matrix.yx += ft_matrix.yy * skew / 100;
-      } else {
+      else
         ft_matrix.xy += -ft_matrix.xx * skew / 100;
-      }
     }
     if (m_pSubstFont->m_SubstFlags & FXFONT_SUBST_MM) {
       AdjustMMParams(glyph_index, dest_width, m_pSubstFont->m_Weight);
     }
   }
   ScopedFontTransform scoped_transform(m_Face, &ft_matrix);
   int load_flags = FXFT_LOAD_NO_BITMAP;
   if (!(m_Face->face_flags & FT_FACE_FLAG_SFNT) || !FT_IS_TRICKY(m_Face)) {
     load_flags |= FT_LOAD_NO_HINTING;
   }
-  int error = FXFT_Load_Glyph(m_Face, glyph_index, load_flags);
-  if (error) {
+  if (FXFT_Load_Glyph(m_Face, glyph_index, load_flags))
     return NULL;
-  }
   if (m_pSubstFont && !(m_pSubstFont->m_SubstFlags & FXFONT_SUBST_MM) &&
       m_pSubstFont->m_Weight > 400) {
-    int index = (m_pSubstFont->m_Weight - 400) / 10;
+    uint32_t index = (m_pSubstFont->m_Weight - 400) / 10;
     if (index >= WEIGHTPOW_ARRAY_SIZE)
       index = WEIGHTPOW_ARRAY_SIZE - 1;
     int level = 0;
-    if (m_pSubstFont->m_Charset == FXFONT_SHIFTJIS_CHARSET) {
+    if (m_pSubstFont->m_Charset == FXFONT_SHIFTJIS_CHARSET)
       level = g_WeightPow_SHIFTJIS[index] * 2 * 65536 / 36655;
-    } else {
+    else
       level = g_WeightPow[index] * 2;
-    }
     FXFT_Outline_Embolden(FXFT_Get_Glyph_Outline(m_Face), level);
   }
   FXFT_Outline_Funcs funcs;
   funcs.move_to = _Outline_MoveTo;
   funcs.line_to = _Outline_LineTo;
   funcs.conic_to = _Outline_ConicTo;
   funcs.cubic_to = _Outline_CubicTo;
   funcs.shift = 0;
   funcs.delta = 0;
   OUTLINE_PARAMS params;
@@ skipping 21 matching lines @@
 void _CFX_UniqueKeyGen::Generate(int count, ...) {
   va_list argList;
   va_start(argList, count);
   for (int i = 0; i < count; i++) {
     int p = va_arg(argList, int);
     ((uint32_t*)m_Key)[i] = p;
   }
   va_end(argList);
   m_KeyLen = count * sizeof(uint32_t);
 }