Fixup FX_RECT and FX_SMALL_RECT classes.

core/src/fpdfapi/fpdf_font/fpdf_font.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/src/fpdfapi/fpdf_font/font_int.h"
 
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_page.h"
@@ skipping 288 matching lines @@
     if (face) {
       m_FontBBox.left = TT2PDF(FXFT_Get_Face_xMin(face), face);
       m_FontBBox.bottom = TT2PDF(FXFT_Get_Face_yMin(face), face);
       m_FontBBox.right = TT2PDF(FXFT_Get_Face_xMax(face), face);
       m_FontBBox.top = TT2PDF(FXFT_Get_Face_yMax(face), face);
       m_Ascent = TT2PDF(FXFT_Get_Face_Ascender(face), face);
       m_Descent = TT2PDF(FXFT_Get_Face_Descender(face), face);
     } else {
       FX_BOOL bFirst = TRUE;
       for (int i = 0; i < 256; i++) {
-        FX_RECT rect;
-        GetCharBBox(i, rect);
+        FX_RECT rect = GetCharBBox(i);
         if (rect.left == rect.right) {
           continue;
         }
         if (bFirst) {
           m_FontBBox = rect;
           bFirst = FALSE;
         } else {
           if (m_FontBBox.top < rect.top) {
             m_FontBBox.top = rect.top;
           }
           if (m_FontBBox.right < rect.right) {
             m_FontBBox.right = rect.right;
           }
           if (m_FontBBox.left > rect.left) {
             m_FontBBox.left = rect.left;
           }
           if (m_FontBBox.bottom > rect.bottom) {
             m_FontBBox.bottom = rect.bottom;
           }
         }
       }
     }
   }
   if (m_Ascent == 0 && m_Descent == 0) {
-    FX_RECT rect;
-    GetCharBBox('A', rect);
-    if (rect.bottom == rect.top) {
-      m_Ascent = m_FontBBox.top;
-    } else {
-      m_Ascent = rect.top;
-    }
-    GetCharBBox('g', rect);
-    if (rect.bottom == rect.top) {
-      m_Descent = m_FontBBox.bottom;
-    } else {
-      m_Descent = rect.bottom;
-    }
+    FX_RECT rect = GetCharBBox('A');
+    m_Ascent = rect.bottom == rect.top ? m_FontBBox.top : rect.top;
+    rect = GetCharBBox('g');
+    m_Descent = rect.bottom == rect.top ? m_FontBBox.bottom : rect.bottom;
   }
 }
 
 void CPDF_Font::LoadUnicodeMap() {
   m_bToUnicodeLoaded = TRUE;
   CPDF_Stream* pStream = m_pFontDict->GetStreamBy("ToUnicode");
   if (!pStream) {
     return;
   }
   m_pToUnicodeMap = new CPDF_ToUnicodeMap;
@@ skipping 378 matching lines @@
 FX_BOOL CPDF_Font::IsStandardFont() const {
   if (!IsType1Font())
     return FALSE;
   if (m_pFontFile)
     return FALSE;
   if (AsType1Font()->GetBase14Font() < 0)
     return FALSE;
   return TRUE;
 }
 
-CPDF_SimpleFont::CPDF_SimpleFont() {
-  FXSYS_memset(m_CharBBox, 0xff, sizeof m_CharBBox);
+CPDF_SimpleFont::CPDF_SimpleFont()
+    : m_pCharNames(nullptr), 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);
-  m_pCharNames = NULL;
-  m_BaseEncoding = PDFFONT_ENCODING_BUILTIN;
 }
 
 CPDF_SimpleFont::~CPDF_SimpleFont() {
   delete[] m_pCharNames;
 }
 
 int CPDF_SimpleFont::GlyphFromCharCode(FX_DWORD charcode, FX_BOOL* pVertGlyph) {
   if (pVertGlyph) {
     *pVertGlyph = FALSE;
   }
@@ skipping 25 matching lines @@
     }
     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) {
     return;
   }
-  m_CharBBox[charcode].Left = TT2PDF(FXFT_Get_Glyph_HoriBearingX(face), face);
-  m_CharBBox[charcode].Right = TT2PDF(
-      FXFT_Get_Glyph_HoriBearingX(face) + FXFT_Get_Glyph_Width(face), face);
-  m_CharBBox[charcode].Top = TT2PDF(FXFT_Get_Glyph_HoriBearingY(face), face);
-  m_CharBBox[charcode].Bottom = TT2PDF(
-      FXFT_Get_Glyph_HoriBearingY(face) - FXFT_Get_Glyph_Height(face), face);
+  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));
+
   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(FX_DWORD charcode, int level) {
   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];
 }
 
-void CPDF_SimpleFont::GetCharBBox(FX_DWORD charcode, FX_RECT& rect, int level) {
-  if (charcode > 0xff) {
+FX_RECT CPDF_SimpleFont::GetCharBBox(FX_DWORD charcode, int level) {
+  if (charcode > 0xff)
     charcode = 0;
-  }
-  if (m_CharBBox[charcode].Left == (int16_t)0xffff) {
+
+  if (m_CharBBox[charcode].Left == FX_SMALL_RECT::kInvalid)
     LoadCharMetrics(charcode);
-  }
-  rect.left = m_CharBBox[charcode].Left;
-  rect.right = m_CharBBox[charcode].Right;
-  rect.bottom = m_CharBBox[charcode].Bottom;
-  rect.top = m_CharBBox[charcode].Top;
+
+  return FX_RECT(m_CharBBox[charcode]);
 }
 
 const FX_CHAR* GetAdobeCharName(int iBaseEncoding,
                                 const CFX_ByteString* pCharNames,
                                 int charcode) {
   ASSERT(charcode >= 0 && charcode < 256);
   if (charcode < 0 || charcode >= 256) {
     return NULL;
   }
   const FX_CHAR* name = NULL;
@@ skipping 846 matching lines @@
   if (charcode >= FX_ArraySize(m_CharWidthL))
     charcode = 0;
 
   if (m_CharWidthL[charcode])
     return m_CharWidthL[charcode];
 
   const CPDF_Type3Char* pChar = LoadChar(charcode, level);
   return pChar ? pChar->m_Width : 0;
 }
 
-void CPDF_Type3Font::GetCharBBox(FX_DWORD charcode, FX_RECT& rect, int level) {
+FX_RECT CPDF_Type3Font::GetCharBBox(FX_DWORD charcode, int level) {
   const CPDF_Type3Char* pChar = LoadChar(charcode, level);
-  if (!pChar) {
-    rect.left = 0;
-    rect.right = 0;
-    rect.top = 0;
-    rect.bottom = 0;
-    return;
-  }
-  rect = pChar->m_BBox;
+  return pChar ? pChar->m_BBox : FX_RECT();
 }
 
 CPDF_Type3Char::CPDF_Type3Char(CPDF_Form* pForm)
     : m_pForm(pForm), m_pBitmap(nullptr), m_bColored(FALSE) {}
 
 CPDF_Type3Char::~CPDF_Type3Char() {
   delete m_pForm;
   delete m_pBitmap;
 }