From 6da8ac5053e9ebf7c4ce0d9d67b0443d3f8f6084 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 3 Apr 2017 15:10:29 -0400 Subject: Drop FXSYS_ from util methods This Cl drops the FXSYS_ from utility methods which are the same on all platforms. Bug: pdfium:694 Change-Id: I0859b60c5ba7af68c929a519dd76f48c27a6c896 Reviewed-on: https://pdfium-review.googlesource.com/3614 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- core/fpdfapi/font/cpdf_type1font.cpp | 6 +++--- core/fpdfapi/font/fpdf_font_cid.cpp | 7 +++---- core/fpdfapi/font/ttgsubtable.cpp | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) (limited to 'core/fpdfapi/font') diff --git a/core/fpdfapi/font/cpdf_type1font.cpp b/core/fpdfapi/font/cpdf_type1font.cpp index e3d96dad37..ac0aed4050 100644 --- a/core/fpdfapi/font/cpdf_type1font.cpp +++ b/core/fpdfapi/font/cpdf_type1font.cpp @@ -35,9 +35,9 @@ int compareString(const void* key, const void* element) { } const char* GlyphNameRemap(const char* pStrAdobe) { - const GlyphNameMap* found = static_cast(FXSYS_bsearch( - pStrAdobe, g_GlyphNameSubsts, FX_ArraySize(g_GlyphNameSubsts), - sizeof(GlyphNameMap), compareString)); + const GlyphNameMap* found = static_cast( + bsearch(pStrAdobe, g_GlyphNameSubsts, FX_ArraySize(g_GlyphNameSubsts), + sizeof(GlyphNameMap), compareString)); return found ? found->m_pStrUnicode : nullptr; } diff --git a/core/fpdfapi/font/fpdf_font_cid.cpp b/core/fpdfapi/font/fpdf_font_cid.cpp index 64b041738e..434fe62ede 100644 --- a/core/fpdfapi/font/fpdf_font_cid.cpp +++ b/core/fpdfapi/font/fpdf_font_cid.cpp @@ -579,8 +579,7 @@ void CPDF_CMap::LoadEmbedded(const uint8_t* pData, uint32_t size) { *(uint32_t*)m_pAddMapping = parser.m_AddMaps.GetSize() / 8; memcpy(m_pAddMapping + 4, parser.m_AddMaps.GetBuffer(), parser.m_AddMaps.GetSize()); - FXSYS_qsort(m_pAddMapping + 4, parser.m_AddMaps.GetSize() / 8, 8, - CompareDWORD); + qsort(m_pAddMapping + 4, parser.m_AddMaps.GetSize() / 8, 8, CompareDWORD); } } @@ -596,8 +595,8 @@ uint16_t CPDF_CMap::CIDFromCharCode(uint32_t charcode) const { } if (charcode >> 16) { if (m_pAddMapping) { - void* found = FXSYS_bsearch(&charcode, m_pAddMapping + 4, - *(uint32_t*)m_pAddMapping, 8, CompareCID); + void* found = bsearch(&charcode, m_pAddMapping + 4, + *(uint32_t*)m_pAddMapping, 8, CompareCID); if (!found) return 0; return (uint16_t)(((uint32_t*)found)[1] % 65536 + charcode - diff --git a/core/fpdfapi/font/ttgsubtable.cpp b/core/fpdfapi/font/ttgsubtable.cpp index 4fae5d41d2..d2a6b9ab52 100644 --- a/core/fpdfapi/font/ttgsubtable.cpp +++ b/core/fpdfapi/font/ttgsubtable.cpp @@ -49,9 +49,9 @@ void CFX_GlyphMap::SetAt(int key, int value) { } bool CFX_GlyphMap::Lookup(int key, int& value) { - void* pResult = FXSYS_bsearch(&key, m_Buffer.GetBuffer(), - m_Buffer.GetSize() / sizeof(_IntPair), - sizeof(_IntPair), _CompareInt); + void* pResult = + bsearch(&key, m_Buffer.GetBuffer(), m_Buffer.GetSize() / sizeof(_IntPair), + sizeof(_IntPair), _CompareInt); if (!pResult) { return false; } -- cgit v1.2.3