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/cmaps/fpdf_cmaps.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'core/fpdfapi/cmaps') diff --git a/core/fpdfapi/cmaps/fpdf_cmaps.cpp b/core/fpdfapi/cmaps/fpdf_cmaps.cpp index ca01d431f4..cb2f09fb3c 100644 --- a/core/fpdfapi/cmaps/fpdf_cmaps.cpp +++ b/core/fpdfapi/cmaps/fpdf_cmaps.cpp @@ -76,15 +76,15 @@ uint16_t FPDFAPI_CIDFromCharCode(const FXCMAP_CMap* pMap, uint32_t charcode) { while (1) { if (pMap->m_DWordMapType == FXCMAP_CMap::Range) { uint16_t* found = static_cast( - FXSYS_bsearch(&charcode, pMap->m_pDWordMap, pMap->m_DWordCount, 8, - compareDWordRange)); + bsearch(&charcode, pMap->m_pDWordMap, pMap->m_DWordCount, 8, + compareDWordRange)); if (found) return found[3] + (uint16_t)charcode - found[1]; } else if (pMap->m_DWordMapType == FXCMAP_CMap::Single) { uint16_t* found = static_cast( - FXSYS_bsearch(&charcode, pMap->m_pDWordMap, pMap->m_DWordCount, 6, - compareDWordSingle)); + bsearch(&charcode, pMap->m_pDWordMap, pMap->m_DWordCount, 6, + compareDWordSingle)); if (found) return found[2]; } @@ -101,13 +101,13 @@ uint16_t FPDFAPI_CIDFromCharCode(const FXCMAP_CMap* pMap, uint32_t charcode) { if (!pMap->m_pWordMap) return 0; if (pMap->m_WordMapType == FXCMAP_CMap::Single) { - uint16_t* found = static_cast(FXSYS_bsearch( - &code, pMap->m_pWordMap, pMap->m_WordCount, 4, compareWord)); + uint16_t* found = static_cast( + bsearch(&code, pMap->m_pWordMap, pMap->m_WordCount, 4, compareWord)); if (found) return found[1]; } else if (pMap->m_WordMapType == FXCMAP_CMap::Range) { - uint16_t* found = static_cast(FXSYS_bsearch( + uint16_t* found = static_cast(bsearch( &code, pMap->m_pWordMap, pMap->m_WordCount, 6, compareWordRange)); if (found) return found[2] + code - found[0]; -- cgit v1.2.3