Cleanup CFX_UnicodeEncoding and remove IFX_FontEncoding.

core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.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 "../../../include/fpdfapi/fpdf_page.h"
 #include "../../../include/fpdfapi/fpdf_module.h"
 #include "../fpdf_page/pageint.h"
 #include <limits.h>
@@ skipping 408 matching lines @@
   pFontDesc->SetAtInteger("CapHeight", capheight);
   pFontDesc->SetAtInteger("StemV", pLogFont->lfWeight / 5);
   AddIndirectObject(pFontDesc);
   pFontDict->SetAtReference("FontDescriptor", this, pFontDesc);
   hFont = SelectObject(hDC, hFont);
   DeleteObject(hFont);
   DeleteDC(hDC);
   return LoadFont(pBaseDict);
 }
 #endif
+
 #if (_FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_)
 uint32_t FX_GetLangHashCode(const FX_CHAR* pStr) {
   FXSYS_assert(pStr != NULL);
   int32_t iLength = FXSYS_strlen(pStr);
   const FX_CHAR* pStrEnd = pStr + iLength;
   uint32_t uHashCode = 0;
   while (pStr < pStrEnd) {
     uHashCode = 31 * uHashCode + tolower(*pStr++);
   }
   return uHashCode;
@@ skipping 345 matching lines @@
       }
     }
   }
   pFontDesc->SetAtInteger("StemV", fStemV);
   AddIndirectObject(pFontDesc);
   pFontDict->SetAtReference("FontDescriptor", this, pFontDesc);
   CFRelease(traits);
   CFRelease(languages);
   return LoadFont(pBaseDict);
 }
-#endif
+#endif  // (_FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_)
+
 static void _InsertWidthArray1(CFX_Font* pFont,
-                               IFX_FontEncoding* pEncoding,
+                               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->GetInteger(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);
 }
+
 CPDF_Font* CPDF_Document::AddFont(CFX_Font* pFont, int charset, FX_BOOL bVert) {
   if (pFont == NULL) {
     return NULL;
   }
   FX_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(" ", "");
   int flags = 0;
   if (pFont->IsBold()) {
     flags |= PDFFONT_FORCEBOLD;
   }
   if (pFont->IsItalic()) {
     flags |= PDFFONT_ITALIC;
   }
   if (pFont->IsFixedWidth()) {
     flags |= PDFFONT_FIXEDPITCH;
   }
   CPDF_Dictionary* pBaseDict = new CPDF_Dictionary;
   pBaseDict->SetAtName("Type", "Font");
-  IFX_FontEncoding* pEncoding = FXGE_CreateUnicodeEncoding(pFont);
+  nonstd::unique_ptr<CFX_UnicodeEncoding> pEncoding(
+      new CFX_UnicodeEncoding(pFont));
   CPDF_Dictionary* pFontDict = pBaseDict;
   if (!bCJK) {
     CPDF_Array* pWidths = new CPDF_Array;
     int charcode;
     for (charcode = 32; charcode < 128; charcode++) {
       int glyph_index = pEncoding->GlyphFromCharCode(charcode);
       int char_width = pFont->GetGlyphWidth(glyph_index);
       pWidths->AddInteger(char_width);
     }
     if (charset == FXFONT_ANSI_CHARSET || charset == FXFONT_DEFAULT_CHARSET ||
@@ skipping 57 matching lines @@
     CFX_ByteString cmap;
     CFX_ByteString ordering;
     int supplement;
     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, 0x20, 0x7e, pWidthArray);
+        _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, 0x20, 0x20, pWidthArray);
+        _InsertWidthArray1(pFont, pEncoding.get(), 0x20, 0x20, pWidthArray);
         pWidthArray->AddInteger(814);
-        _InsertWidthArray1(pFont, pEncoding, 0x21, 0x7e, pWidthArray);
+        _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, 0x20, 0x7e, pWidthArray);
+        _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, 0x20, 0x7d, pWidthArray);
+        _InsertWidthArray1(pFont, pEncoding.get(), 0x20, 0x7d, pWidthArray);
         pWidthArray->AddInteger(326);
-        _InsertWidthArray1(pFont, pEncoding, 0xa0, 0xa0, pWidthArray);
+        _InsertWidthArray1(pFont, pEncoding.get(), 0xa0, 0xa0, pWidthArray);
         pWidthArray->AddInteger(327);
-        _InsertWidthArray1(pFont, pEncoding, 0xa1, 0xdf, pWidthArray);
+        _InsertWidthArray1(pFont, pEncoding.get(), 0xa1, 0xdf, pWidthArray);
         pWidthArray->AddInteger(631);
-        _InsertWidthArray1(pFont, pEncoding, 0x7e, 0x7e, pWidthArray);
+        _InsertWidthArray1(pFont, pEncoding.get(), 0x7e, 0x7e, pWidthArray);
         break;
     }
     pBaseDict->SetAtName("Subtype", "Type0");
     pBaseDict->SetAtName("BaseFont", basefont);
     pBaseDict->SetAtName("Encoding", cmap);
     pFontDict->SetAt("W", pWidthArray);
     pFontDict->SetAtName("Type", "Font");
     pFontDict->SetAtName("Subtype", "CIDFontType2");
     pFontDict->SetAtName("BaseFont", basefont);
     CPDF_Dictionary* pCIDSysInfo = new CPDF_Dictionary;
@@ skipping 33 matching lines @@
     FX_DWORD 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;
       }
     }
   }
-  delete pEncoding;
   pFontDesc->SetAtInteger("StemV", nStemV);
   AddIndirectObject(pFontDesc);
   pFontDict->SetAtReference("FontDescriptor", this, pFontDesc);
   return LoadFont(pBaseDict);
 }
 static int InsertDeletePDFPage(CPDF_Document* pDoc,
                                CPDF_Dictionary* pPages,
                                int nPagesToGo,
                                CPDF_Dictionary* pPage,
                                FX_BOOL bInsert,
@@ skipping 121 matching lines @@
 void FPDFAPI_FlatPageAttr(CPDF_Dictionary* pPageDict,
                           const CFX_ByteStringC& name) {
   if (pPageDict->KeyExist(name)) {
     return;
   }
   CPDF_Object* pObj = FPDFAPI_GetPageAttr(pPageDict, name);
   if (pObj) {
     pPageDict->SetAt(name, pObj->Clone());
   }
 }