Remove more CFX_ArrayTemplate from fpdf_edit_doc.cpp

core/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 <limits.h>
 
+#include <vector>
+
 #include "core/fpdfapi/fpdf_font/include/cpdf_font.h"
 #include "core/fpdfapi/fpdf_font/include/cpdf_fontencoding.h"
 #include "core/fpdfapi/fpdf_page/include/cpdf_page.h"
 #include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_reference.h"
 #include "core/fpdfapi/include/cpdf_modulemgr.h"
 #include "core/fpdfapi/ipdf_rendermodule.h"
+#include "third_party/base/stl_util.h"
 
 CPDF_Document::CPDF_Document() : CPDF_IndirectObjectHolder(NULL) {
   m_pRootDict = NULL;
   m_pInfoDict = NULL;
   m_bLinearized = FALSE;
   m_dwFirstPageNo = 0;
   m_dwFirstPageObjNum = 0;
   m_pDocPage = CPDF_ModuleMgr::Get()->GetPageModule()->CreateDocData(this);
   m_pDocRender = CPDF_ModuleMgr::Get()->GetRenderModule()->CreateDocData(this);
 }
@@ skipping 140 matching lines @@
     0x00B6, 0x00B7, 0x00F8, 0x00B9, 0x0157, 0x00BB, 0x00BC, 0x00BD, 0x00BE,
     0x00E6, 0x0104, 0x012E, 0x0100, 0x0106, 0x00C4, 0x00C5, 0x0118, 0x0112,
     0x010C, 0x00C9, 0x0179, 0x0116, 0x0122, 0x0136, 0x012A, 0x013B, 0x0160,
     0x0143, 0x0145, 0x00D3, 0x014C, 0x00D5, 0x00D6, 0x00D7, 0x0172, 0x0141,
     0x015A, 0x016A, 0x00DC, 0x017B, 0x017D, 0x00DF, 0x0105, 0x012F, 0x0101,
     0x0107, 0x00E4, 0x00E5, 0x0119, 0x0113, 0x010D, 0x00E9, 0x017A, 0x0117,
     0x0123, 0x0137, 0x012B, 0x013C, 0x0161, 0x0144, 0x0146, 0x00F3, 0x014D,
     0x00F5, 0x00F6, 0x00F7, 0x0173, 0x0142, 0x015B, 0x016B, 0x00FC, 0x017C,
     0x017E, 0x02D9,
 };
-typedef struct {
+
+struct FX_CharsetUnicodes {
   uint8_t m_Charset;
   const uint16_t* m_pUnicodes;
-} FX_CharsetUnicodes;
+};
+
 const FX_CharsetUnicodes g_FX_CharsetUnicodes[] = {
     {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 (_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_)
 static 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);
   int i;
   for (i = 1; i < size; i++)
@@ skipping 290 matching lines @@
 static void _CFString2CFXByteString(CFStringRef src, CFX_ByteString& dest) {
   SInt32 len = CFStringGetLength(src);
   CFRange range = CFRangeMake(0, len);
   CFIndex used = 0;
   UInt8* pBuffer = (UInt8*)calloc(len + 1, sizeof(UInt8));
   CFStringGetBytes(src, range, kCFStringEncodingASCII, 0, false, pBuffer, len,
                    &used);
   dest = (FX_CHAR*)pBuffer;
   free(pBuffer);
 }
-FX_BOOL IsHasCharSet(CFArrayRef languages,
-                     const CFX_ArrayTemplate<uint32_t>& charSets) {
-  int iCount = charSets.GetSize();
+static bool IsHasCharSet(CFArrayRef languages,
+                         const std::vector<uint32_t>& charSets) {
   for (int i = 0; i < CFArrayGetCount(languages); ++i) {
     CFStringRef language = (CFStringRef)CFArrayGetValueAtIndex(languages, i);
     uint32_t CharSet = FX_GetCharsetFromLang(
         CFStringGetCStringPtr(language, kCFStringEncodingMacRoman), -1);
-    for (int j = 0; j < iCount; ++j) {
-      if (CharSet == charSets[j]) {
-        return TRUE;
-      }
-    }
+    if (pdfium::ContainsValue(charSets, CharSet))
+      return true;
   }
-  return FALSE;
+  return false;
 }
 void FX_GetCharWidth(CTFontRef font, UniChar start, UniChar end, int* width) {
   CGFloat size = CTFontGetSize(font);
   for (; start <= end; ++start) {
     CGGlyph pGlyph = 0;
     CFIndex count = 1;
     CTFontGetGlyphsForCharacters(font, &start, &pGlyph, count);
     CGSize advances;
     CTFontGetAdvancesForGlyphs(font, kCTFontDefaultOrientation, &pGlyph,
                                &advances, 1);
@@ skipping 28 matching lines @@
 }
 CPDF_Font* CPDF_Document::AddMacFont(CTFontRef pFont,
                                      FX_BOOL bVert,
                                      FX_BOOL bTranslateName) {
   CTFontRef font = (CTFontRef)pFont;
   CTFontDescriptorRef descriptor = CTFontCopyFontDescriptor(font);
   if (!descriptor) {
     return NULL;
   }
   CFX_ByteString basefont;
-  FX_BOOL bCJK = FALSE;
   int flags = 0, italicangle = 0, ascend = 0, descend = 0, capheight = 0,
       bbox[4];
   FXSYS_memset(bbox, 0, sizeof(int) * 4);
   CFArrayRef languages = (CFArrayRef)CTFontDescriptorCopyAttribute(
       descriptor, kCTFontLanguagesAttribute);
   if (!languages) {
     CFRelease(descriptor);
     return NULL;
   }
-  CFX_ArrayTemplate<uint32_t> charSets;
-  charSets.Add(FXFONT_CHINESEBIG5_CHARSET);
-  charSets.Add(FXFONT_GB2312_CHARSET);
-  charSets.Add(FXFONT_HANGEUL_CHARSET);
-  charSets.Add(FXFONT_SHIFTJIS_CHARSET);
-  if (IsHasCharSet(languages, charSets)) {
-    bCJK = TRUE;
-  }
+
+  bool bCJK = IsHasCharSet(languages,
+                           {FXFONT_CHINESEBIG5_CHARSET, FXFONT_GB2312_CHARSET,

[Tom Sepez, 2016/04/21 22:06:35]

brace-initializing a vector in an argument list is legit, right?

+                            FXFONT_HANGEUL_CHARSET, FXFONT_SHIFTJIS_CHARSET});
   CFRelease(descriptor);
   CFDictionaryRef traits = (CFDictionaryRef)CTFontCopyTraits(font);
   if (!traits) {
     CFRelease(languages);
     return NULL;
   }
   CFNumberRef sybolicTrait =
       (CFNumberRef)CFDictionaryGetValue(traits, kCTFontSymbolicTrait);
   CTFontSymbolicTraits trait = 0;
   CFNumberGetValue(sybolicTrait, kCFNumberSInt32Type, &trait);
@@ skipping 29 matching lines @@
   }
   if (basefont.IsEmpty()) {
     CFStringRef fullName = CTFontCopyFullName(font);
     _CFString2CFXByteString(fullName, basefont);
     CFRelease(fullName);
   }
   basefont.Replace(" ", "");
   CPDF_Dictionary* pBaseDict = new CPDF_Dictionary;
   CPDF_Dictionary* pFontDict = pBaseDict;
   if (!bCJK) {
-    charSets.RemoveAll();
-    charSets.Add(FXFONT_ANSI_CHARSET);
-    charSets.Add(FXFONT_DEFAULT_CHARSET);
-    charSets.Add(FXFONT_SYMBOL_CHARSET);
-    if (IsHasCharSet(languages, charSets)) {
-      charSets.RemoveAll();
-      charSets.Add(FXFONT_SYMBOL_CHARSET);
-      if (IsHasCharSet(languages, charSets)) {
+    if (IsHasCharSet(languages, {FXFONT_ANSI_CHARSET, FXFONT_DEFAULT_CHARSET,
+                                 FXFONT_SYMBOL_CHARSET})) {
+      if (IsHasCharSet(languages, {FXFONT_SYMBOL_CHARSET})) {
         flags |= PDFFONT_SYMBOLIC;
       } else {
         flags |= PDFFONT_NONSYMBOLIC;
       }
       pBaseDict->SetAtName("Encoding", "WinAnsiEncoding");
     } else {
       flags |= PDFFONT_NONSYMBOLIC;
       size_t i;
-      for (i = 0; i < sizeof g_FX_CharsetUnicodes / sizeof(FX_CharsetUnicodes);
-           i++) {
-        charSets.RemoveAll();
-        charSets.Add(g_FX_CharsetUnicodes[i].m_Charset);

[Tom Sepez, 2016/04/21 22:06:35]

Note; currently be n^2, checking the old things we know we don't have each time
around.

-        if (IsHasCharSet(languages, charSets)) {
+      for (i = 0; i < FX_ArraySize(g_FX_CharsetUnicodes); ++i) {
+        if (IsHasCharSet(languages, {g_FX_CharsetUnicodes[i].m_Charset}))
           break;
-        }
       }
-      if (i < sizeof g_FX_CharsetUnicodes / sizeof(FX_CharsetUnicodes)) {
+      if (i < FX_ArraySize(g_FX_CharsetUnicodes) {
         CPDF_Dictionary* pEncoding = new CPDF_Dictionary;
         pEncoding->SetAtName("BaseEncoding", "WinAnsiEncoding");
         CPDF_Array* pArray = new CPDF_Array;
         pArray->AddInteger(128);
         const uint16_t* pUnicodes = g_FX_CharsetUnicodes[i].m_pUnicodes;
         for (int j = 0; j < 128; j++) {
           CFX_ByteString name = PDF_AdobeNameFromUnicode(pUnicodes[j]);
           if (name.IsEmpty()) {
             pArray->AddName(".notdef");
           } else {
@@ skipping 25 matching lines @@
     pBaseDict->SetAt("Widths", pWidths);
   } else {
     flags |= PDFFONT_NONSYMBOLIC;
     CPDF_Array* pArray = NULL;
     pFontDict = new CPDF_Dictionary;
     CFX_ByteString cmap;
     CFX_ByteString ordering;
     int supplement;
     FX_BOOL bFound = FALSE;
     CPDF_Array* pWidthArray = new CPDF_Array;
-    charSets.RemoveAll();
-    charSets.Add(FXFONT_CHINESEBIG5_CHARSET);
-    if (IsHasCharSet(languages, charSets)) {
+    if (IsHasCharSet(languages, {FXFONT_CHINESEBIG5_CHARSET})) {
       cmap = bVert ? "ETenms-B5-V" : "ETenms-B5-H";
       ordering = "CNS1";
       supplement = 4;
       pWidthArray->AddInteger(1);
       _InsertWidthArray(font, 0x20, 0x7e, pWidthArray);
       bFound = TRUE;
     }
-    charSets.RemoveAll();
-    charSets.Add(FXFONT_GB2312_CHARSET);
-    if (!bFound && IsHasCharSet(languages, charSets)) {
+    if (!bFound && IsHasCharSet(languages, {FXFONT_GB2312_CHARSET})) {
       cmap = bVert ? "GBK-EUC-V" : "GBK-EUC-H";
       ordering = "GB1", supplement = 2;
       pWidthArray->AddInteger(7716);
       _InsertWidthArray(font, 0x20, 0x20, pWidthArray);
       pWidthArray->AddInteger(814);
       _InsertWidthArray(font, 0x21, 0x7e, pWidthArray);
       bFound = TRUE;
     }
-    charSets.RemoveAll();
-    charSets.Add(FXFONT_HANGEUL_CHARSET);
-    if (!bFound && IsHasCharSet(languages, charSets)) {
+    if (!bFound && IsHasCharSet(languages, {FXFONT_HANGEUL_CHARSET})) {
       cmap = bVert ? "KSCms-UHC-V" : "KSCms-UHC-H";
       ordering = "Korea1";
       supplement = 2;
       pWidthArray->AddInteger(1);
       _InsertWidthArray(font, 0x20, 0x7e, pWidthArray);
       bFound = TRUE;
     }
-    charSets.RemoveAll();
-    charSets.Add(FXFONT_SHIFTJIS_CHARSET);
-    if (!bFound && IsHasCharSet(languages, charSets)) {
+    if (!bFound && IsHasCharSet(languages, {FXFONT_SHIFTJIS_CHARSET})) {
       cmap = bVert ? "90ms-RKSJ-V" : "90ms-RKSJ-H";
       ordering = "Japan1";
       supplement = 5;
       pWidthArray->AddInteger(231);
       _InsertWidthArray(font, 0x20, 0x7d, pWidthArray);
       pWidthArray->AddInteger(326);
       _InsertWidthArray(font, 0xa0, 0xa0, pWidthArray);
       pWidthArray->AddInteger(327);
       _InsertWidthArray(font, 0xa1, 0xdf, pWidthArray);
       pWidthArray->AddInteger(631);
@@ skipping 404 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());
   }
 }