Reduce duplicated code in CPDF_Document by adding auxiliary methods

core/fpdfapi/fpdf_parser/cpdf_document.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/fpdfapi/fpdf_parser/include/cpdf_document.h"
 
 #include <memory>
 #include <set>
@@ skipping 165 matching lines @@
     {FXFONT_THAI_CHARSET, g_FX_CP874Unicodes},
     {FXFONT_EASTEUROPE_CHARSET, g_FX_CP1250Unicodes},
     {FXFONT_RUSSIAN_CHARSET, g_FX_CP1251Unicodes},
     {FXFONT_GREEK_CHARSET, g_FX_CP1253Unicodes},
     {FXFONT_TURKISH_CHARSET, g_FX_CP1254Unicodes},
     {FXFONT_HEBREW_CHARSET, g_FX_CP1255Unicodes},
     {FXFONT_ARABIC_CHARSET, g_FX_CP1256Unicodes},
     {FXFONT_BALTIC_CHARSET, g_FX_CP1257Unicodes},
 };
 
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
-void InsertWidthArray(HDC hDC, int start, int end, CPDF_Array* pWidthArray) {
-  int size = end - start + 1;
-  int* widths = FX_Alloc(int, size);
-  GetCharWidth(hDC, start, end, widths);
+void InsertWidthArrayImpl(int* widths, int size, CPDF_Array* pWidthArray) {
   int i;
   for (i = 1; i < size; i++) {
     if (widths[i] != *widths)
       break;
   }
   if (i == size) {
     int first = pWidthArray->GetIntegerAt(pWidthArray->GetCount() - 1);
     pWidthArray->AddInteger(first + size - 1);
     pWidthArray->AddInteger(*widths);
   } else {
     CPDF_Array* pWidthArray1 = new CPDF_Array;
     pWidthArray->Add(pWidthArray1);
     for (i = 0; i < size; i++)
       pWidthArray1->AddInteger(widths[i]);
   }
   FX_Free(widths);
 }
 
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+void InsertWidthArray(HDC hDC, int start, int end, CPDF_Array* pWidthArray) {
+  int size = end - start + 1;
+  int* widths = FX_Alloc(int, size);
+  GetCharWidth(hDC, start, end, widths);
+  InsertWidthArrayImpl(widths, size, pWidthArray);
+}
+
 CFX_ByteString FPDF_GetPSNameFromTT(HDC hDC) {
   CFX_ByteString result;
   DWORD size = ::GetFontData(hDC, 'eman', 0, nullptr, 0);
   if (size != GDI_ERROR) {
     LPBYTE buffer = FX_Alloc(BYTE, size);
     ::GetFontData(hDC, 'eman', 0, buffer, size);
     result = GetNameFromTT(buffer, size, 6);
     FX_Free(buffer);
   }
   return result;
 }
 #endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 
 void InsertWidthArray1(CFX_Font* pFont,
                        CFX_UnicodeEncoding* pEncoding,
                        FX_WCHAR start,
                        FX_WCHAR end,
                        CPDF_Array* pWidthArray) {
   int size = end - start + 1;
   int* widths = FX_Alloc(int, size);
   int i;
   for (i = 0; i < size; i++) {
     int glyph_index = pEncoding->GlyphFromCharCode(start + i);
     widths[i] = pFont->GetGlyphWidth(glyph_index);
   }
-  for (i = 1; i < size; i++) {
-    if (widths[i] != *widths)
-      break;
-  }
-  if (i == size) {
-    int first = pWidthArray->GetIntegerAt(pWidthArray->GetCount() - 1);
-    pWidthArray->AddInteger(first + size - 1);
-    pWidthArray->AddInteger(*widths);
-  } else {
-    CPDF_Array* pWidthArray1 = new CPDF_Array;
-    pWidthArray->Add(pWidthArray1);
-    for (i = 0; i < size; i++) {
-      pWidthArray1->AddInteger(widths[i]);
-    }
-  }
-  FX_Free(widths);
+  InsertWidthArrayImpl(widths, size, pWidthArray);
 }
 
 int InsertDeletePDFPage(CPDF_Document* pDoc,
                         CPDF_Dictionary* pPages,
                         int nPagesToGo,
                         CPDF_Dictionary* pPage,
                         FX_BOOL bInsert,
                         std::set<CPDF_Dictionary*>* pVisited) {
   CPDF_Array* pKidList = pPages->GetArrayFor("Kids");
   if (!pKidList)
@@ skipping 128 matching lines @@
     basefont += ",Bold";
   else if (italic)
     basefont += ",Italic";
   pBaseDict->SetNameFor("Subtype", "TrueType");
   pBaseDict->SetNameFor("BaseFont", basefont);
   pBaseDict->SetNumberFor("FirstChar", 32);
   pBaseDict->SetNumberFor("LastChar", 255);
   pBaseDict->SetFor("Widths", pWidths);
 }
 
+CPDF_Dictionary* CalculateFontDesc(CFX_ByteString basefont,
+                                   int flags,
+                                   int italicangle,
+                                   int ascend,
+                                   int descend,
+                                   CPDF_Array* bbox,
+                                   int32_t stemV) {
+  CPDF_Dictionary* pFontDesc = new CPDF_Dictionary;
+  pFontDesc->SetNameFor("Type", "FontDescriptor");
+  pFontDesc->SetNameFor("FontName", basefont);
+  pFontDesc->SetIntegerFor("Flags", flags);
+  pFontDesc->SetFor("FontBBox", bbox);
+  pFontDesc->SetIntegerFor("ItalicAngle", italicangle);
+  pFontDesc->SetIntegerFor("Ascent", ascend);
+  pFontDesc->SetIntegerFor("Descent", descend);
+  pFontDesc->SetIntegerFor("StemV", stemV);
+  return pFontDesc;
+}
+
 }  // namespace
 
 CPDF_Document::CPDF_Document(std::unique_ptr<CPDF_Parser> pParser)
     : CPDF_IndirectObjectHolder(),
       m_pParser(std::move(pParser)),
       m_pRootDict(nullptr),
       m_pInfoDict(nullptr),
       m_bLinearized(false),
       m_iFirstPageNo(0),
       m_dwFirstPageObjNum(0),
@@ skipping 329 matching lines @@
   for (int j = 0; j < 128; j++) {
     CFX_ByteString name = PDF_AdobeNameFromUnicode(pUnicodes[j]);
     pArray->AddName(name.IsEmpty() ? ".notdef" : name);
   }
   pEncodingDict->SetFor("Differences", pArray);
   AddIndirectObject(pEncodingDict);
   pBaseDict->SetReferenceFor("Encoding", this, pEncodingDict);
   return i;
 }
 
+CPDF_Dictionary* CPDF_Document::ProcessbCJK(
+    CPDF_Dictionary* pBaseDict,
+    int charset,
+    FX_BOOL bVert,
+    CFX_ByteString basefont,
+    std::function<void(FX_WCHAR, FX_WCHAR, CPDF_Array*)> Insert) {
+  CPDF_Dictionary* pFontDict = new CPDF_Dictionary;
+  CFX_ByteString cmap;
+  CFX_ByteString ordering;
+  int supplement = 0;
+  CPDF_Array* pWidthArray = new CPDF_Array;
+  switch (charset) {
+    case FXFONT_CHINESEBIG5_CHARSET:
+      cmap = bVert ? "ETenms-B5-V" : "ETenms-B5-H";
+      ordering = "CNS1";
+      supplement = 4;
+      pWidthArray->AddInteger(1);
+      Insert(0x20, 0x7e, pWidthArray);
+      break;
+    case FXFONT_GB2312_CHARSET:
+      cmap = bVert ? "GBK-EUC-V" : "GBK-EUC-H";
+      ordering = "GB1";
+      supplement = 2;
+      pWidthArray->AddInteger(7716);
+      Insert(0x20, 0x20, pWidthArray);
+      pWidthArray->AddInteger(814);
+      Insert(0x21, 0x7e, pWidthArray);
+      break;
+    case FXFONT_HANGEUL_CHARSET:
+      cmap = bVert ? "KSCms-UHC-V" : "KSCms-UHC-H";
+      ordering = "Korea1";
+      supplement = 2;
+      pWidthArray->AddInteger(1);
+      Insert(0x20, 0x7e, pWidthArray);
+      break;
+    case FXFONT_SHIFTJIS_CHARSET:
+      cmap = bVert ? "90ms-RKSJ-V" : "90ms-RKSJ-H";
+      ordering = "Japan1";
+      supplement = 5;
+      pWidthArray->AddInteger(231);
+      Insert(0x20, 0x7d, pWidthArray);
+      pWidthArray->AddInteger(326);
+      Insert(0xa0, 0xa0, pWidthArray);
+      pWidthArray->AddInteger(327);
+      Insert(0xa1, 0xdf, pWidthArray);
+      pWidthArray->AddInteger(631);
+      Insert(0x7e, 0x7e, pWidthArray);
+      break;
+  }
+  pBaseDict->SetNameFor("Subtype", "Type0");
+  pBaseDict->SetNameFor("BaseFont", basefont);
+  pBaseDict->SetNameFor("Encoding", cmap);
+  pFontDict->SetFor("W", pWidthArray);
+  pFontDict->SetNameFor("Type", "Font");
+  pFontDict->SetNameFor("Subtype", "CIDFontType2");
+  pFontDict->SetNameFor("BaseFont", basefont);
+  CPDF_Dictionary* pCIDSysInfo = new CPDF_Dictionary;
+  pCIDSysInfo->SetStringFor("Registry", "Adobe");
+  pCIDSysInfo->SetStringFor("Ordering", ordering);
+  pCIDSysInfo->SetIntegerFor("Supplement", supplement);
+  pFontDict->SetFor("CIDSystemInfo", pCIDSysInfo);
+  CPDF_Array* pArray = new CPDF_Array;
+  pBaseDict->SetFor("DescendantFonts", pArray);
+  AddIndirectObject(pFontDict);
+  pArray->AddReference(this, pFontDict);
+  return pFontDict;
+}
+
 CPDF_Font* CPDF_Document::AddFont(CFX_Font* pFont, int charset, FX_BOOL bVert) {
   if (!pFont)
     return nullptr;
 
   bool bCJK = charset == FXFONT_CHINESEBIG5_CHARSET ||
               charset == FXFONT_GB2312_CHARSET ||
               charset == FXFONT_HANGEUL_CHARSET ||
               charset == FXFONT_SHIFTJIS_CHARSET;
   CFX_ByteString basefont = pFont->GetFamilyName();
   basefont.Replace(" ", "");
@@ skipping 28 matching lines @@
         for (int j = 0; j < 128; j++) {
           int glyph_index = pEncoding->GlyphFromCharCode(pUnicodes[j]);
           int char_width = pFont->GetGlyphWidth(glyph_index);
           pWidths->AddInteger(char_width);
         }
       }
     }
     ProcessNonbCJK(pBaseDict, pFont->IsBold(), pFont->IsItalic(), basefont,
                    pWidths);
   } else {
-    flags |= PDFFONT_NONSYMBOLIC;
-    pFontDict = new CPDF_Dictionary;
-    CFX_ByteString cmap;
-    CFX_ByteString ordering;
-    int supplement = 0;
-    CPDF_Array* pWidthArray = new CPDF_Array;
-    switch (charset) {
-      case FXFONT_CHINESEBIG5_CHARSET:
-        cmap = bVert ? "ETenms-B5-V" : "ETenms-B5-H";
-        ordering = "CNS1";
-        supplement = 4;
-        pWidthArray->AddInteger(1);
-        InsertWidthArray1(pFont, pEncoding.get(), 0x20, 0x7e, pWidthArray);
-        break;
-      case FXFONT_GB2312_CHARSET:
-        cmap = bVert ? "GBK-EUC-V" : "GBK-EUC-H";
-        ordering = "GB1";
-        supplement = 2;
-        pWidthArray->AddInteger(7716);
-        InsertWidthArray1(pFont, pEncoding.get(), 0x20, 0x20, pWidthArray);
-        pWidthArray->AddInteger(814);
-        InsertWidthArray1(pFont, pEncoding.get(), 0x21, 0x7e, pWidthArray);
-        break;
-      case FXFONT_HANGEUL_CHARSET:
-        cmap = bVert ? "KSCms-UHC-V" : "KSCms-UHC-H";
-        ordering = "Korea1";
-        supplement = 2;
-        pWidthArray->AddInteger(1);
-        InsertWidthArray1(pFont, pEncoding.get(), 0x20, 0x7e, pWidthArray);
-        break;
-      case FXFONT_SHIFTJIS_CHARSET:
-        cmap = bVert ? "90ms-RKSJ-V" : "90ms-RKSJ-H";
-        ordering = "Japan1";
-        supplement = 5;
-        pWidthArray->AddInteger(231);
-        InsertWidthArray1(pFont, pEncoding.get(), 0x20, 0x7d, pWidthArray);
-        pWidthArray->AddInteger(326);
-        InsertWidthArray1(pFont, pEncoding.get(), 0xa0, 0xa0, pWidthArray);
-        pWidthArray->AddInteger(327);
-        InsertWidthArray1(pFont, pEncoding.get(), 0xa1, 0xdf, pWidthArray);
-        pWidthArray->AddInteger(631);
-        InsertWidthArray1(pFont, pEncoding.get(), 0x7e, 0x7e, pWidthArray);
-        break;
-    }
-    pBaseDict->SetNameFor("Subtype", "Type0");
-    pBaseDict->SetNameFor("BaseFont", basefont);
-    pBaseDict->SetNameFor("Encoding", cmap);
-    pFontDict->SetFor("W", pWidthArray);
-    pFontDict->SetNameFor("Type", "Font");
-    pFontDict->SetNameFor("Subtype", "CIDFontType2");
-    pFontDict->SetNameFor("BaseFont", basefont);
-    CPDF_Dictionary* pCIDSysInfo = new CPDF_Dictionary;
-    pCIDSysInfo->SetStringFor("Registry", "Adobe");
-    pCIDSysInfo->SetStringFor("Ordering", ordering);
-    pCIDSysInfo->SetIntegerFor("Supplement", supplement);
-    pFontDict->SetFor("CIDSystemInfo", pCIDSysInfo);
-    CPDF_Array* pArray = new CPDF_Array;
-    pBaseDict->SetFor("DescendantFonts", pArray);
-    AddIndirectObject(pFontDict);
-    pArray->AddReference(this, pFontDict);
+    auto Insert = [&](FX_WCHAR start, FX_WCHAR end, CPDF_Array* widthArr) {

[Tom Sepez, 2016/09/16 19:42:14]

nit: local not needed, it's much more fun to have the lambda inside the function
call itself. Also, can we be specific about what we capture, and capture by
value where possible?

+      InsertWidthArray1(pFont, pEncoding.get(), start, end, widthArr);
+    };
+    pFontDict = ProcessbCJK(pBaseDict, charset, bVert, basefont, Insert);
   }
   AddIndirectObject(pBaseDict);
-  CPDF_Dictionary* pFontDesc = new CPDF_Dictionary;
-  pFontDesc->SetNameFor("Type", "FontDescriptor");
-  pFontDesc->SetNameFor("FontName", basefont);
-  pFontDesc->SetIntegerFor("Flags", flags);
-  pFontDesc->SetIntegerFor(
-      "ItalicAngle",
-      pFont->GetSubstFont() ? pFont->GetSubstFont()->m_ItalicAngle : 0);
-  pFontDesc->SetIntegerFor("Ascent", pFont->GetAscent());
-  pFontDesc->SetIntegerFor("Descent", pFont->GetDescent());
+  int italicangle =
+      pFont->GetSubstFont() ? pFont->GetSubstFont()->m_ItalicAngle : 0;
   FX_RECT bbox;
   pFont->GetBBox(bbox);
   CPDF_Array* pBBox = new CPDF_Array;
   pBBox->AddInteger(bbox.left);
   pBBox->AddInteger(bbox.bottom);
   pBBox->AddInteger(bbox.right);
   pBBox->AddInteger(bbox.top);
-  pFontDesc->SetFor("FontBBox", pBBox);
   int32_t nStemV = 0;
   if (pFont->GetSubstFont()) {
     nStemV = pFont->GetSubstFont()->m_Weight / 5;
   } else {
     static const FX_CHAR stem_chars[] = {'i', 'I', '!', '1'};
     const size_t count = FX_ArraySize(stem_chars);
     uint32_t glyph = pEncoding->GlyphFromCharCode(stem_chars[0]);
     nStemV = pFont->GetGlyphWidth(glyph);
     for (size_t i = 1; i < count; i++) {
       glyph = pEncoding->GlyphFromCharCode(stem_chars[i]);
       int width = pFont->GetGlyphWidth(glyph);
       if (width > 0 && width < nStemV)
         nStemV = width;
     }
   }
-  pFontDesc->SetIntegerFor("StemV", nStemV);
+  CPDF_Dictionary* pFontDesc =
+      CalculateFontDesc(basefont, flags, italicangle, pFont->GetAscent(),
+                        pFont->GetDescent(), pBBox, nStemV);
   AddIndirectObject(pFontDesc);
   pFontDict->SetReferenceFor("FontDescriptor", this, pFontDesc);
   return LoadFont(pBaseDict);
 }
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 CPDF_Font* CPDF_Document::AddWindowsFont(LOGFONTW* pLogFont,
                                          FX_BOOL bVert,
                                          FX_BOOL bTranslateName) {
   LOGFONTA lfa;
@@ skipping 62 matching lines @@
       CalculateEncodingDict(pLogFont->lfCharSet, pBaseDict);
     }
     int char_widths[224];
     GetCharWidth(hDC, 32, 255, char_widths);
     CPDF_Array* pWidths = new CPDF_Array;
     for (size_t i = 0; i < 224; i++)
       pWidths->AddInteger(char_widths[i]);
     ProcessNonbCJK(pBaseDict, pLogFont->lfWeight > FW_MEDIUM,
                    pLogFont->lfItalic != 0, basefont, pWidths);
   } else {
-    pFontDict = new CPDF_Dictionary;
-    CFX_ByteString cmap;
-    CFX_ByteString ordering;
-    int supplement = 0;
-    CPDF_Array* pWidthArray = new CPDF_Array;
-    switch (pLogFont->lfCharSet) {
-      case CHINESEBIG5_CHARSET:
-        cmap = bVert ? "ETenms-B5-V" : "ETenms-B5-H";
-        ordering = "CNS1";
-        supplement = 4;
-        pWidthArray->AddInteger(1);
-        InsertWidthArray(hDC, 0x20, 0x7e, pWidthArray);
-        break;
-      case GB2312_CHARSET:
-        cmap = bVert ? "GBK-EUC-V" : "GBK-EUC-H";
-        ordering = "GB1", supplement = 2;
-        pWidthArray->AddInteger(7716);
-        InsertWidthArray(hDC, 0x20, 0x20, pWidthArray);
-        pWidthArray->AddInteger(814);
-        InsertWidthArray(hDC, 0x21, 0x7e, pWidthArray);
-        break;
-      case HANGEUL_CHARSET:
-        cmap = bVert ? "KSCms-UHC-V" : "KSCms-UHC-H";
-        ordering = "Korea1";
-        supplement = 2;
-        pWidthArray->AddInteger(1);
-        InsertWidthArray(hDC, 0x20, 0x7e, pWidthArray);
-        break;
-      case SHIFTJIS_CHARSET:
-        cmap = bVert ? "90ms-RKSJ-V" : "90ms-RKSJ-H";
-        ordering = "Japan1";
-        supplement = 5;
-        pWidthArray->AddInteger(231);
-        InsertWidthArray(hDC, 0x20, 0x7d, pWidthArray);
-        pWidthArray->AddInteger(326);
-        InsertWidthArray(hDC, 0xa0, 0xa0, pWidthArray);
-        pWidthArray->AddInteger(327);
-        InsertWidthArray(hDC, 0xa1, 0xdf, pWidthArray);
-        pWidthArray->AddInteger(631);
-        InsertWidthArray(hDC, 0x7e, 0x7e, pWidthArray);
-        break;
-    }
-    pBaseDict->SetNameFor("Subtype", "Type0");
-    pBaseDict->SetNameFor("BaseFont", basefont);
-    pBaseDict->SetNameFor("Encoding", cmap);
-    pFontDict->SetFor("W", pWidthArray);
-    pFontDict->SetNameFor("Type", "Font");
-    pFontDict->SetNameFor("Subtype", "CIDFontType2");
-    pFontDict->SetNameFor("BaseFont", basefont);
-    CPDF_Dictionary* pCIDSysInfo = new CPDF_Dictionary;
-    pCIDSysInfo->SetStringFor("Registry", "Adobe");
-    pCIDSysInfo->SetStringFor("Ordering", ordering);
-    pCIDSysInfo->SetIntegerFor("Supplement", supplement);
-    pFontDict->SetFor("CIDSystemInfo", pCIDSysInfo);
-    CPDF_Array* pArray = new CPDF_Array;
-    pBaseDict->SetFor("DescendantFonts", pArray);
-    AddIndirectObject(pFontDict);
-    pArray->AddReference(this, pFontDict);
+    auto Insert = [&](FX_WCHAR start, FX_WCHAR end, CPDF_Array* widthArr) {
+      InsertWidthArray(hDC, start, end, widthArr);
+    };
+    pFontDict =
+        ProcessbCJK(pBaseDict, pLogFont->lfCharSet, bVert, basefont, Insert);
   }
   AddIndirectObject(pBaseDict);
-  CPDF_Dictionary* pFontDesc = new CPDF_Dictionary;
-  pFontDesc->SetNameFor("Type", "FontDescriptor");
-  pFontDesc->SetNameFor("FontName", basefont);
-  pFontDesc->SetIntegerFor("Flags", flags);
   CPDF_Array* pBBox = new CPDF_Array;
   for (int i = 0; i < 4; i++)
     pBBox->AddInteger(bbox[i]);
-  pFontDesc->SetFor("FontBBox", pBBox);
-  pFontDesc->SetIntegerFor("ItalicAngle", italicangle);
-  pFontDesc->SetIntegerFor("Ascent", ascend);
-  pFontDesc->SetIntegerFor("Descent", descend);
+  CPDF_Dictionary* pFontDesc =
+      CalculateFontDesc(basefont, flags, italicangle, ascend, descend, pBBox,
+                        pLogFont->lfWeight / 5);
   pFontDesc->SetIntegerFor("CapHeight", capheight);
-  pFontDesc->SetIntegerFor("StemV", pLogFont->lfWeight / 5);
   AddIndirectObject(pFontDesc);
   pFontDict->SetReferenceFor("FontDescriptor", this, pFontDesc);
   hFont = SelectObject(hDC, hFont);
   DeleteObject(hFont);
   DeleteDC(hDC);
   return LoadFont(pBaseDict);
 }
 #endif  //  _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_