Fixup FX_RECT and FX_SMALL_RECT classes.

core/src/fpdfapi/fpdf_font/fpdf_font_cid.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 1029 matching lines @@
 
 CPDF_CIDFont::CPDF_CIDFont()
     : m_pCMap(nullptr),
       m_pAllocatedCMap(nullptr),
       m_pCID2UnicodeMap(nullptr),
       m_pCIDToGIDMap(nullptr),
       m_bCIDIsGID(FALSE),
       m_pAnsiWidths(nullptr),
       m_bAdobeCourierStd(FALSE),
       m_pTTGSUBTable(nullptr) {
-  FXSYS_memset(m_CharBBox, 0xff, 256 * sizeof(FX_SMALL_RECT));
 }
 
 CPDF_CIDFont::~CPDF_CIDFont() {
   if (m_pAnsiWidths) {
     FX_Free(m_pAnsiWidths);
   }
   delete m_pAllocatedCMap;
   delete m_pCIDToGIDMap;
   delete m_pTTGSUBTable;
 }
@@ skipping 221 matching lines @@
       m_DefaultVY = pDefaultArray->GetIntegerAt(0);
       m_DefaultW1 = pDefaultArray->GetIntegerAt(1);
     } else {
       m_DefaultVY = 880;
       m_DefaultW1 = -1000;
     }
   }
   return TRUE;
 }
 
-void CPDF_CIDFont::GetCharBBox(FX_DWORD charcode, FX_RECT& rect, int level) {
-  if (charcode < 256 && m_CharBBox[charcode].Right != -1) {
-    rect.bottom = m_CharBBox[charcode].Bottom;
-    rect.left = m_CharBBox[charcode].Left;
-    rect.right = m_CharBBox[charcode].Right;
-    rect.top = m_CharBBox[charcode].Top;
-    return;
-  }
+FX_RECT CPDF_CIDFont::GetCharBBox(FX_DWORD charcode, int level) {
+  if (charcode < 256 && m_CharBBox[charcode].Right != -1)
+    return FX_RECT(m_CharBBox[charcode]);
+
+  FX_RECT rect;
   FX_BOOL bVert = FALSE;
   int glyph_index = GlyphFromCharCode(charcode, &bVert);
   FXFT_Face face = m_Font.GetFace();
   if (face) {
-    rect.left = rect.bottom = rect.right = rect.top = 0;
     if (FXFT_Is_Face_Tricky(face)) {
       int err = FXFT_Load_Glyph(face, glyph_index,
                                 FXFT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH);
       if (!err) {
         FXFT_BBox cbox;
         FXFT_Glyph glyph;
         err = FXFT_Get_Glyph(((FXFT_Face)face)->glyph, &glyph);
         if (!err) {
           FXFT_Glyph_Get_CBox(glyph, FXFT_GLYPH_BBOX_PIXELS, &cbox);
           int pixel_size_x = ((FXFT_Face)face)->size->metrics.x_ppem;
           int pixel_size_y = ((FXFT_Face)face)->size->metrics.y_ppem;
           if (pixel_size_x == 0 || pixel_size_y == 0) {
-            rect.left = cbox.xMin;
-            rect.right = cbox.xMax;
-            rect.top = cbox.yMax;
-            rect.bottom = cbox.yMin;
+            rect = FX_RECT(cbox.xMin, cbox.yMax, cbox.xMax, cbox.yMin);
           } else {
-            rect.left = cbox.xMin * 1000 / pixel_size_x;
-            rect.right = cbox.xMax * 1000 / pixel_size_x;
-            rect.top = cbox.yMax * 1000 / pixel_size_y;
-            rect.bottom = cbox.yMin * 1000 / pixel_size_y;
+            rect = FX_RECT(cbox.xMin * 1000 / pixel_size_x,
+                           cbox.yMax * 1000 / pixel_size_y,
+                           cbox.xMax * 1000 / pixel_size_x,
+                           cbox.yMin * 1000 / pixel_size_y);
           }
           if (rect.top > FXFT_Get_Face_Ascender(face)) {
             rect.top = FXFT_Get_Face_Ascender(face);
           }
           if (rect.bottom < FXFT_Get_Face_Descender(face)) {
             rect.bottom = FXFT_Get_Face_Descender(face);
           }
           FXFT_Done_Glyph(glyph);
         }
       }
     } else {
       int err = FXFT_Load_Glyph(face, glyph_index, FXFT_LOAD_NO_SCALE);
       if (err == 0) {
-        rect.left = TT2PDF(FXFT_Get_Glyph_HoriBearingX(face), face);
-        rect.right = TT2PDF(
-            FXFT_Get_Glyph_HoriBearingX(face) + FXFT_Get_Glyph_Width(face),
-            face);
-        rect.top = TT2PDF(FXFT_Get_Glyph_HoriBearingY(face), face);
+        rect = FX_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));
         rect.top += rect.top / 64;
-        rect.bottom = TT2PDF(
-            FXFT_Get_Glyph_HoriBearingY(face) - FXFT_Get_Glyph_Height(face),
-            face);
       }
     }
-  } else {
-    rect = FX_RECT(0, 0, 0, 0);
   }
   if (!m_pFontFile && m_Charset == CIDSET_JAPAN1) {
     FX_WORD CID = CIDFromCharCode(charcode);
     const uint8_t* pTransform = GetCIDTransform(CID);
     if (pTransform && !bVert) {
       CFX_Matrix matrix(CIDTransformToFloat(pTransform[0]),
                         CIDTransformToFloat(pTransform[1]),
                         CIDTransformToFloat(pTransform[2]),
                         CIDTransformToFloat(pTransform[3]),
                         CIDTransformToFloat(pTransform[4]) * 1000,
                         CIDTransformToFloat(pTransform[5]) * 1000);
       CFX_FloatRect rect_f(rect);
       rect_f.Transform(&matrix);
       rect = rect_f.GetOutterRect();
     }
   }
-  if (charcode < 256) {
-    m_CharBBox[charcode].Bottom = (short)rect.bottom;
-    m_CharBBox[charcode].Left = (short)rect.left;
-    m_CharBBox[charcode].Right = (short)rect.right;
-    m_CharBBox[charcode].Top = (short)rect.top;
-  }
+  if (charcode < 256)
+    m_CharBBox[charcode] = rect.ToSmallRect();
+
+  return rect;
 }
 int CPDF_CIDFont::GetCharWidthF(FX_DWORD charcode, int level) {
   if (m_pAnsiWidths && charcode < 0x80) {
     return m_pAnsiWidths[charcode];
   }
   FX_WORD cid = CIDFromCharCode(charcode);
   int size = m_WidthList.GetSize();
   FX_DWORD* list = m_WidthList.GetData();
   for (int i = 0; i < size; i += 3) {
     if (cid >= list[i] && cid <= list[i + 1]) {
@@ skipping 349 matching lines @@
 
 const uint8_t* CPDF_CIDFont::GetCIDTransform(FX_WORD CID) const {
   if (m_Charset != CIDSET_JAPAN1 || m_pFontFile)
     return nullptr;
 
   const struct CIDTransform* found = (const struct CIDTransform*)FXSYS_bsearch(
       &CID, g_Japan1_VertCIDs, FX_ArraySize(g_Japan1_VertCIDs),
       sizeof(g_Japan1_VertCIDs[0]), CompareCIDTransform);
   return found ? &found->a : nullptr;
 }