Use std::lower_bound() in a couple places.

core/src/fxge/ge/fx_ge_fontmap.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 <algorithm>
 #include <limits>
 #include <vector>
 
 #include "core/include/fxge/fx_freetype.h"
 #include "core/include/fxge/fx_ge.h"
 #include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h"
 #include "core/src/fxge/ge/fx_text_int.h"
 #include "third_party/base/stl_util.h"
 
 #define GET_TT_SHORT(w) (FX_WORD)(((w)[0] << 8) | (w)[1])
@@ skipping 174 matching lines @@
 };
 
 const struct FX_FontStyle {
   const FX_CHAR* style;
   int32_t len;
 } g_FontStyles[] = {
     {"Bold", 4}, {"Italic", 6}, {"BoldItalic", 10}, {"Reg", 3}, {"Regular", 7},
 };
 
 const struct CHARSET_MAP {
   uint8_t charset;

[Tom Sepez, 2016/02/25 20:32:53]

Can we call this CODEPAGE_MAP and flip the order of the members?  A
CodepageToCharsetTable should contain { codepage, charset} pairs.

[Lei Zhang, 2016/02/25 20:48:16]

Done.

   FX_WORD codepage;
 } g_Codepage2CharsetTable[] = {
     {1, 0},      {2, 42},     {254, 437},  {255, 850},  {222, 874},
     {128, 932},  {134, 936},  {129, 949},  {136, 950},  {238, 1250},
     {204, 1251}, {0, 1252},   {161, 1253}, {162, 1254}, {177, 1255},
     {178, 1256}, {186, 1257}, {163, 1258}, {130, 1361}, {77, 10000},
-    {78, 10001}, {79, 10003}, {80, 10008}, {81, 10002}, {83, 10005},
-    {84, 10004}, {85, 10006}, {86, 10081}, {87, 10021}, {88, 10029},
-    {89, 10007},
+    {78, 10001}, {81, 10002}, {79, 10003}, {84, 10004}, {83, 10005},

[Lei Zhang, 2016/02/25 20:11:27]

Uhh, these weren't sorted by |codepage| value.

[Tom Sepez, 2016/02/25 20:32:53]

But they were sorted by the wrong index value due to the above confusion.

[Lei Zhang, 2016/02/25 20:48:16]

No they weren't sorted by |charset| either.

+    {85, 10006}, {89, 10007}, {80, 10008}, {87, 10021}, {88, 10029},
+    {86, 10081},
 };
 
 const FX_DWORD kTableNAME = FXDWORD_GET_MSBFIRST("name");
 const FX_DWORD kTableTTCF = FXDWORD_GET_MSBFIRST("ttcf");
 
 int CompareFontFamilyString(const void* key, const void* element) {
   CFX_ByteString str_key((const FX_CHAR*)key);
   if (str_key.Find(((AltFontFamily*)element)->m_pFontName) != -1) {
     return 0;
   }
@@ skipping 53 matching lines @@
       FX_DWORD offset = GET_TT_LONG(p + 8);
       FX_DWORD size = GET_TT_LONG(p + 12);
       FXSYS_fseek(pFile, offset, FXSYS_SEEK_SET);
       return FPDF_ReadStringFromFile(pFile, size);
     }
   }
   return CFX_ByteString();
 }
 
 uint8_t GetCharsetFromCodePage(FX_WORD codepage) {
-  int32_t iEnd = sizeof(g_Codepage2CharsetTable) / sizeof(CHARSET_MAP) - 1;
-  FXSYS_assert(iEnd >= 0);
-  int32_t iStart = 0, iMid;
-  do {
-    iMid = (iStart + iEnd) / 2;
-    const CHARSET_MAP& cp = g_Codepage2CharsetTable[iMid];
-    if (codepage == cp.codepage) {
-      return cp.charset;
-    }
-    if (codepage < cp.codepage) {
-      iEnd = iMid - 1;
-    } else {
-      iStart = iMid + 1;
-    }
-  } while (iStart <= iEnd);
+  const CHARSET_MAP* pEnd =
+      g_Codepage2CharsetTable + FX_ArraySize(g_Codepage2CharsetTable);
+  const CHARSET_MAP* pCharmap =
+      std::lower_bound(g_Codepage2CharsetTable, pEnd, codepage,

[Tom Sepez, 2016/02/25 20:32:53]

std::binary_search() for an exact hit and avoid the retest at line 292?

[Lei Zhang, 2016/02/25 20:48:16]

std::binary_search() returns a bool, not an iterator/pointer.

[Tom Sepez, 2016/02/25 22:20:13]

Ah, Carry on.

+                       [](const CHARSET_MAP& charset, FX_WORD page) {
+                         return charset.codepage < page;
+                       });
+  if (pCharmap < pEnd && codepage == pCharmap->codepage)
+    return pCharmap->charset;
   return 1;
 }
 
 CFX_ByteString GetFontFamily(CFX_ByteString fontName, int nStyle) {
   if (fontName.Find("Script") >= 0) {
     if ((nStyle & FX_FONT_STYLE_Bold) == FX_FONT_STYLE_Bold) {
       fontName = "ScriptMTBold";
     } else if (fontName.Find("Palace") >= 0) {
       fontName = "PalaceScriptMT";
     } else if (fontName.Find("French") >= 0) {
@@ skipping 1289 matching lines @@
 int PDF_GetStandardFontName(CFX_ByteString* name) {
   AltFontName* found = static_cast<AltFontName*>(
       FXSYS_bsearch(name->c_str(), g_AltFontNames, FX_ArraySize(g_AltFontNames),
                     sizeof(AltFontName), CompareString));
   if (!found)
     return -1;
 
   *name = g_Base14FontNames[found->m_Index];
   return found->m_Index;
 }