From ab8270ae3a4b43dfe4780eb76889a390cfc5334b Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Sun, 10 Aug 2014 13:51:09 -0500
Subject: [PATCH] Fixes searchRange calculation

---
 src/core/fonts.js | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/core/fonts.js b/src/core/fonts.js
index eb1f5e9d9..fce7f8dbd 100644
--- a/src/core/fonts.js
+++ b/src/core/fonts.js
@@ -2224,21 +2224,6 @@ var IdentityToUnicodeMap = (function IdentityToUnicodeMapClosure() {
 })();
 
 var OpenTypeFileBuilder = (function OpenTypeFileBuilderClosure() {
-  function getMaxPower2(number) {
-    var maxPower = 0;
-    var value = number;
-    while (value >= 2) {
-      value /= 2;
-      maxPower++;
-    }
-
-    value = 2;
-    for (var i = 1; i < maxPower; i++) {
-      value *= 2;
-    }
-    return value;
-  }
-
   function writeInt16(dest, offset, num) {
     dest[offset] = (num >> 8) & 0xFF;
     dest[offset + 1] = num & 0xFF;
@@ -2274,10 +2259,15 @@ var OpenTypeFileBuilder = (function OpenTypeFileBuilderClosure() {
 
   OpenTypeFileBuilder.getSearchParams =
       function OpenTypeFileBuilder_getSearchParams(entriesCount, entrySize) {
-    var searchRange = getMaxPower2(entriesCount) * entrySize;
+    var maxPower2 = 1, log2 = 0;
+    while ((maxPower2 ^ entriesCount) > maxPower2) {
+      maxPower2 <<= 1;
+      log2++;
+    }
+    var searchRange = maxPower2 * entrySize;
     return {
       range: searchRange,
-      entry: (Math.log(entriesCount) / Math.log(2)) | 0,
+      entry: log2,
       rangeShift: entrySize * entriesCount - searchRange
     };
   };