2 files changed, 41 insertions, 51 deletions

diff --git a/core/src/fxge/ge/fx_ge_text.cpp b/core/src/fxge/ge/fx_ge_text.cpp
index 5e7773e300..d330576433 100644
--- a/core/src/fxge/ge/fx_ge_text.cpp
+++ b/core/src/fxge/ge/fx_ge_text.cpp
@@ -1238,14 +1238,10 @@ CFX_FaceCache::~CFX_FaceCache() {
     delete pair.second;
   }
   m_SizeMap.clear();
-  FX_POSITION pos = m_PathMap.GetStartPosition();
-  void* key1;
-  CFX_PathData* pPath;
-  while (pos) {
-    m_PathMap.GetNextAssoc(pos, key1, (void*&)pPath);
-    delete pPath;
-  }
-  m_PathMap.RemoveAll();
+  for (const auto& pair : m_PathMap) {
+    delete pair.second;
+  }
+  m_PathMap.clear();
 }
 #if _FXM_PLATFORM_ != _FXM_PLATFORM_APPLE_
 void CFX_FaceCache::InitPlatform() {}
@@ -1266,17 +1262,16 @@ CFX_GlyphBitmap* CFX_FaceCache::LookUpGlyphBitmap(
   } else {
     pSizeCache = it->second;
   }
-  CFX_GlyphBitmap* pGlyphBitmap = NULL;
-  if (pSizeCache->m_GlyphMap.Lookup((void*)(uintptr_t)glyph_index,
-                                    (void*&)pGlyphBitmap)) {
-    return pGlyphBitmap;
-  }
-  pGlyphBitmap = RenderGlyph(pFont, glyph_index, bFontStyle, pMatrix,
-                             dest_width, anti_alias);
-  if (pGlyphBitmap == NULL) {
-    return NULL;
-  }
-  pSizeCache->m_GlyphMap.SetAt((void*)(uintptr_t)glyph_index, pGlyphBitmap);
+  auto it2 = pSizeCache->m_GlyphMap.find(glyph_index);
+  if (it2 != pSizeCache->m_GlyphMap.end())
+    return it2->second;
+
+  CFX_GlyphBitmap* pGlyphBitmap = RenderGlyph(pFont, glyph_index, bFontStyle,
+                                              pMatrix, dest_width, anti_alias);
+  if (!pGlyphBitmap)
+    return nullptr;
+
+  pSizeCache->m_GlyphMap[glyph_index] = pGlyphBitmap;
   return pGlyphBitmap;
 }
 const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(CFX_Font* pFont,
@@ -1338,14 +1333,14 @@ const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(CFX_Font* pFont,
   auto it = m_SizeMap.find(FaceGlyphsKey);
   if (it != m_SizeMap.end()) {
     CFX_SizeGlyphCache* pSizeCache = it->second;
-    if (pSizeCache->m_GlyphMap.Lookup((void*)(uintptr_t)glyph_index,
-                                      (void*&)pGlyphBitmap)) {
-      return pGlyphBitmap;
-    }
+    auto it2 = pSizeCache->m_GlyphMap.find(glyph_index);
+    if (it2 != pSizeCache->m_GlyphMap.end())
+      return it2->second;
+
     pGlyphBitmap = RenderGlyph_Nativetext(pFont, glyph_index, pMatrix,
                                           dest_width, anti_alias);
     if (pGlyphBitmap) {
-      pSizeCache->m_GlyphMap.SetAt((void*)(uintptr_t)glyph_index, pGlyphBitmap);
+      pSizeCache->m_GlyphMap[glyph_index] = pGlyphBitmap;
       return pGlyphBitmap;
     }
   } else {
@@ -1354,7 +1349,7 @@ const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(CFX_Font* pFont,
     if (pGlyphBitmap) {
       CFX_SizeGlyphCache* pSizeCache = new CFX_SizeGlyphCache;
       m_SizeMap[FaceGlyphsKey] = pSizeCache;
-      pSizeCache->m_GlyphMap.SetAt((void*)(uintptr_t)glyph_index, pGlyphBitmap);
+      pSizeCache->m_GlyphMap[glyph_index] = pGlyphBitmap;
       return pGlyphBitmap;
     }
   }
@@ -1374,14 +1369,10 @@ const CFX_GlyphBitmap* CFX_FaceCache::LoadGlyphBitmap(CFX_Font* pFont,
 #endif
 }
 CFX_SizeGlyphCache::~CFX_SizeGlyphCache() {
-  FX_POSITION pos = m_GlyphMap.GetStartPosition();
-  void* Key;
-  CFX_GlyphBitmap* pGlyphBitmap = NULL;
-  while (pos) {
-    m_GlyphMap.GetNextAssoc(pos, Key, (void*&)pGlyphBitmap);
-    delete pGlyphBitmap;
-  }
-  m_GlyphMap.RemoveAll();
+  for (const auto& pair : m_GlyphMap) {
+    delete pair.second;
+  }
+  m_GlyphMap.clear();
 }
 #define CONTRAST_RAMP_STEP 1
 void CFX_Font::AdjustMMParams(int glyph_index, int dest_width, int weight) {
@@ -1652,24 +1643,21 @@ CFX_GlyphBitmap* CFX_FaceCache::RenderGlyph(CFX_Font* pFont,
 const CFX_PathData* CFX_FaceCache::LoadGlyphPath(CFX_Font* pFont,
                                                  FX_DWORD glyph_index,
                                                  int dest_width) {
-  if (m_Face == NULL || glyph_index == (FX_DWORD)-1) {
-    return NULL;
-  }
-  CFX_PathData* pGlyphPath = NULL;
-  void* key;
+  if (!m_Face || glyph_index == (FX_DWORD)-1)
+    return nullptr;
+
+  FX_DWORD key = glyph_index;
   if (pFont->GetSubstFont()) {
-    key = (void*)(uintptr_t)(
-        glyph_index + ((pFont->GetSubstFont()->m_Weight / 16) << 15) +
-        ((pFont->GetSubstFont()->m_ItalicAngle / 2) << 21) +
-        ((dest_width / 16) << 25) + (pFont->IsVertical() << 31));
-  } else {
-    key = (void*)(uintptr_t)glyph_index;
+    key += (((pFont->GetSubstFont()->m_Weight / 16) << 15) +
+            ((pFont->GetSubstFont()->m_ItalicAngle / 2) << 21) +
+            ((dest_width / 16) << 25) + (pFont->IsVertical() << 31));
   }
-  if (m_PathMap.Lookup(key, (void*&)pGlyphPath)) {
-    return pGlyphPath;
-  }
-  pGlyphPath = pFont->LoadGlyphPath(glyph_index, dest_width);
-  m_PathMap.SetAt(key, pGlyphPath);
+  auto it = m_PathMap.find(key);
+  if (it != m_PathMap.end())
+    return it->second;
+
+  CFX_PathData* pGlyphPath = pFont->LoadGlyphPath(glyph_index, dest_width);
+  m_PathMap[key] = pGlyphPath;
   return pGlyphPath;
 }
 typedef struct {
diff --git a/core/src/fxge/ge/text_int.h b/core/src/fxge/ge/text_int.h
index 1b96cfbdd2..5a691671be 100644
--- a/core/src/fxge/ge/text_int.h
+++ b/core/src/fxge/ge/text_int.h
@@ -7,6 +7,8 @@
 #ifndef CORE_SRC_FXGE_GE_TEXT_INT_H_
 #define CORE_SRC_FXGE_GE_TEXT_INT_H_
 
+#include <map>
+
 #include "core/include/fxge/fx_font.h"
 #include "core/include/fxge/fx_freetype.h"
 
@@ -17,9 +19,9 @@ struct _CFX_UniqueKeyGen {
 };
 class CFX_SizeGlyphCache {
  public:
-  CFX_SizeGlyphCache() { m_GlyphMap.InitHashTable(253); }
+  CFX_SizeGlyphCache() {}
   ~CFX_SizeGlyphCache();
-  CFX_MapPtrToPtr m_GlyphMap;
+  std::map<FX_DWORD, CFX_GlyphBitmap*> m_GlyphMap;
 };
 class CTTFontDesc {
  public: