Get rid of FX_SMALL_RECT.

core/fpdfapi/fpdf_font/cpdf_simplefont.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_font/cpdf_simplefont.h"
 
 #include "core/fpdfapi/fpdf_font/font_int.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
 #include "core/fxge/include/fx_freetype.h"
 
 CPDF_SimpleFont::CPDF_SimpleFont() : m_BaseEncoding(PDFFONT_ENCODING_BUILTIN) {
   FXSYS_memset(m_CharWidth, 0xff, sizeof(m_CharWidth));
   FXSYS_memset(m_GlyphIndex, 0xff, sizeof(m_GlyphIndex));
   FXSYS_memset(m_ExtGID, 0xff, sizeof(m_ExtGID));
+  for (size_t i = 0; i < FX_ArraySize(m_CharBBox); ++i) {
+    m_CharBBox[i] = FX_RECT(-1, -1, -1, -1);
+  }

[dsinclair, 2016/08/15 12:48:03]

nit: no {}'s

[Lei Zhang, 2016/08/15 17:05:35]

Done.

 }
 
 CPDF_SimpleFont::~CPDF_SimpleFont() {}
 
 int CPDF_SimpleFont::GlyphFromCharCode(uint32_t charcode, bool* pVertGlyph) {
   if (pVertGlyph)
     *pVertGlyph = false;
 
   if (charcode > 0xff)
     return -1;
@@ skipping 17 matching lines @@
       if (m_bUseFontWidth) {
         m_CharWidth[charcode] = m_CharWidth[32];
       }
     }
     return;
   }
   FXFT_Face face = m_Font.GetFace();
   int err = FXFT_Load_Glyph(
       face, glyph_index,
       FXFT_LOAD_NO_SCALE | FXFT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH);
-  if (err) {
+  if (err)
     return;
-  }
-  m_CharBBox[charcode] = FX_SMALL_RECT(
-      TT2PDF(FXFT_Get_Glyph_HoriBearingX(face), face),
-      TT2PDF(FXFT_Get_Glyph_HoriBearingY(face), face),
-      TT2PDF(FXFT_Get_Glyph_HoriBearingX(face) + FXFT_Get_Glyph_Width(face),
-             face),
-      TT2PDF(FXFT_Get_Glyph_HoriBearingY(face) - FXFT_Get_Glyph_Height(face),
-             face));
+
+  int iHoriBearingX = FXFT_Get_Glyph_HoriBearingX(face);
+  int iHoriBearingY = FXFT_Get_Glyph_HoriBearingY(face);
+  m_CharBBox[charcode] =
+      FX_RECT(TT2PDF(iHoriBearingX, face), TT2PDF(iHoriBearingY, face),
+              TT2PDF(iHoriBearingX + FXFT_Get_Glyph_Width(face), face),
+              TT2PDF(iHoriBearingY - FXFT_Get_Glyph_Height(face), face));
 
   if (m_bUseFontWidth) {
     int TT_Width = TT2PDF(FXFT_Get_Glyph_HoriAdvance(face), face);
     if (m_CharWidth[charcode] == 0xffff) {
       m_CharWidth[charcode] = TT_Width;
     } else if (TT_Width && !IsEmbedded()) {
       m_CharBBox[charcode].right =
           m_CharBBox[charcode].right * m_CharWidth[charcode] / TT_Width;
       m_CharBBox[charcode].left =
           m_CharBBox[charcode].left * m_CharWidth[charcode] / TT_Width;
     }
   }
 }
 
 int CPDF_SimpleFont::GetCharWidthF(uint32_t charcode, int level) {
-  if (charcode > 0xff) {
+  if (charcode > 0xff)
     charcode = 0;
-  }
+
   if (m_CharWidth[charcode] == 0xffff) {
     LoadCharMetrics(charcode);
     if (m_CharWidth[charcode] == 0xffff) {
       m_CharWidth[charcode] = 0;
     }
   }
-  return (int16_t)m_CharWidth[charcode];
+  return m_CharWidth[charcode];
 }
 
 FX_RECT CPDF_SimpleFont::GetCharBBox(uint32_t charcode, int level) {
   if (charcode > 0xff)
     charcode = 0;
 
-  if (m_CharBBox[charcode].left == FX_SMALL_RECT::kInvalid)
+  if (m_CharBBox[charcode].left == -1)
     LoadCharMetrics(charcode);
 
-  return FX_RECT(m_CharBBox[charcode]);
+  return m_CharBBox[charcode];
 }
 
 FX_BOOL CPDF_SimpleFont::LoadCommon() {
   CPDF_Dictionary* pFontDesc = m_pFontDict->GetDictBy("FontDescriptor");
   if (pFontDesc) {
     LoadFontDescriptor(pFontDesc);
   }
   CPDF_Array* pWidthArray = m_pFontDict->GetArrayBy("Widths");
-  m_bUseFontWidth = TRUE;
+  m_bUseFontWidth = !pWidthArray;
   if (pWidthArray) {
-    m_bUseFontWidth = FALSE;
     if (pFontDesc && pFontDesc->KeyExist("MissingWidth")) {
       int MissingWidth = pFontDesc->GetIntegerBy("MissingWidth");
       for (int i = 0; i < 256; i++) {
         m_CharWidth[i] = MissingWidth;
       }
     }
     size_t width_start = m_pFontDict->GetIntegerBy("FirstChar", 0);
     size_t width_end = m_pFontDict->GetIntegerBy("LastChar", 0);
     if (width_start <= 255) {
       if (width_end == 0 || width_end >= width_start + pWidthArray->GetCount())
@@ skipping 80 matching lines @@
     return CFX_WideString();
   return ret;
 }
 
 uint32_t CPDF_SimpleFont::CharCodeFromUnicode(FX_WCHAR unicode) const {
   uint32_t ret = CPDF_Font::CharCodeFromUnicode(unicode);
   if (ret)
     return ret;
   return m_Encoding.CharCodeFromUnicode(unicode);
 }