From 168cfb7ee0f2abbd2bddb7e7d8b430a6d8c6c120 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 10 Dec 2015 15:22:06 -0800 Subject: Fix build broken at 7db2a535f163 Missed some conversions in an ifdef mac block. R=thestig@chromium.org TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1511413008 . --- core/src/fxge/ge/fx_ge_text.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/fxge/ge/fx_ge_text.cpp b/core/src/fxge/ge/fx_ge_text.cpp index 6ab24b3f20..d330576433 100644 --- a/core/src/fxge/ge/fx_ge_text.cpp +++ b/core/src/fxge/ge/fx_ge_text.cpp @@ -1333,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 { @@ -1349,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; } } -- cgit v1.2.3