From 42e541a67181ba8a92ad071b16302374fcf9084e Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Fri, 1 Aug 2014 12:01:47 +0200 Subject: [PATCH 1/2] Add strict equalities in src/shared/fonts_utils.js --- src/shared/fonts_utils.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/shared/fonts_utils.js b/src/shared/fonts_utils.js index bbf56360d..14ba5baa0 100644 --- a/src/shared/fonts_utils.js +++ b/src/shared/fonts_utils.js @@ -45,7 +45,7 @@ function readCharset(aStream, aCharstrings) { sid = aStream.getByte() << 8 | aStream.getByte(); charset[CFFStrings[sid]] = readCharstringEncoding(aCharstrings[i]); } - } else if (format == 1) { + } else if (format === 1) { for (i = 1; i < count + 1; i++) { var first = aStream.getByte(); first = (first << 8) | aStream.getByte(); @@ -76,14 +76,14 @@ function readCharstringEncoding(aString) { var count = aString.length; for (var i = 0; i < count; ) { - var value = aString[i++]; + var value = aString[i++] | 0; var token = null; if (value < 0) { continue; } else if (value <= 11) { token = CFFEncodingMap[value]; - } else if (value == 12) { + } else if (value === 12) { token = CFFEncodingMap[value][aString[i++]]; } else if (value <= 18) { token = CFFEncodingMap[value]; @@ -92,7 +92,7 @@ function readCharstringEncoding(aString) { token = CFFEncodingMap[value]; } else if (value <= 27) { token = CFFEncodingMap[value]; - } else if (value == 28) { + } else if (value === 28) { token = aString[i++] << 8 | aString[i++]; } else if (value <= 31) { token = CFFEncodingMap[value]; @@ -102,7 +102,7 @@ function readCharstringEncoding(aString) { token = (value - 247) * 256 + aString[i++] + 108; } else if (value < 255) { token = -(value - 251) * 256 - aString[i++] - 108; - } else {// value == 255 + } else { // value === 255 token = aString[i++] << 24 | aString[i++] << 16 | aString[i++] << 8 | aString[i]; } @@ -123,19 +123,19 @@ function readFontDictData(aString, aMap) { var count = aString.length; for (var i = 0; i < count; i) { - var value = aString[i++]; + var value = aString[i++] | 0; var token = null; - if (value == 12) { + if (value === 12) { token = aMap[value][aString[i++]]; - } else if (value == 28) { + } else if (value === 28) { token = aString[i++] << 8 | aString[i++]; - } else if (value == 29) { + } else if (value === 29) { token = aString[i++] << 24 | aString[i++] << 16 | aString[i++] << 8 | aString[i++]; - } else if (value == 30) { + } else if (value === 30) { token = ''; var parsed = false; while (!parsed) { @@ -177,7 +177,7 @@ function readFontDictData(aString, aMap) { token = (value - 247) * 256 + aString[i++] + 108; } else if (value <= 254) { token = -(value - 251) * 256 - aString[i++] - 108; - } else if (value == 255) { + } else if (value === 255) { error('255 is not a valid DICT command'); } @@ -230,7 +230,7 @@ function readFontIndexData(aStream, aIsByte) { } dump('Found ' + count + ' objects at offsets :' + - offsets + ' (offsize: ' + offsize + ')'); + offsets + ' (offsize: ' + offsize + ')'); // Now extract the objects var relativeOffset = aStream.pos; @@ -378,9 +378,9 @@ var Type2Parser = function type2Parser(aFilePath) { var charsetEntry = font.get('charset'); if (charsetEntry === 0) { error('Need to support CFFISOAdobeCharset'); - } else if (charsetEntry == 1) { + } else if (charsetEntry === 1) { error('Need to support CFFExpert'); - } else if (charsetEntry == 2) { + } else if (charsetEntry === 2) { error('Need to support CFFExpertSubsetCharset'); } else { aStream.pos = charsetEntry; From ccd71e0a94971dbb175f34e879d0998edcf2f2b9 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Fri, 1 Aug 2014 12:17:33 +0200 Subject: [PATCH 2/2] Add strict equalities in src/shared/util.js --- src/shared/util.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/shared/util.js b/src/shared/util.js index 94835c611..87367edb6 100644 --- a/src/shared/util.js +++ b/src/shared/util.js @@ -21,7 +21,7 @@ var globalScope = (typeof window === 'undefined') ? this : window; -var isWorker = (typeof window == 'undefined'); +var isWorker = (typeof window === 'undefined'); var FONT_IDENTITY_MATRIX = [0.001, 0, 0, 0.001, 0, 0]; @@ -272,7 +272,7 @@ function combineUrl(baseUrl, url) { return url; } var i; - if (url.charAt(0) == '/') { + if (url.charAt(0) === '/') { // absolute path i = baseUrl.indexOf('://'); if (url.charAt(1) === '/') { @@ -946,7 +946,7 @@ function isEmptyObj(obj) { } function isBool(v) { - return typeof v == 'boolean'; + return typeof v === 'boolean'; } function isInt(v) { @@ -1099,7 +1099,7 @@ PDFJS.createPromiseCapability = createPromiseCapability; pendingRejectionCheck: false, scheduleHandlers: function scheduleHandlers(promise) { - if (promise._status == STATUS_PENDING) { + if (promise._status === STATUS_PENDING) { return; } @@ -1125,10 +1125,10 @@ PDFJS.createPromiseCapability = createPromiseCapability; try { if (nextStatus === STATUS_RESOLVED) { - if (typeof(handler.onResolve) == 'function') { + if (typeof handler.onResolve === 'function') { nextValue = handler.onResolve(nextValue); } - } else if (typeof(handler.onReject) === 'function') { + } else if (typeof handler.onReject === 'function') { nextValue = handler.onReject(nextValue); nextStatus = STATUS_RESOLVED; @@ -1295,7 +1295,7 @@ PDFJS.createPromiseCapability = createPromiseCapability; return; } - if (status == STATUS_RESOLVED && + if (status === STATUS_RESOLVED && Promise.isPromise(value)) { value.then(this._updateStatus.bind(this, STATUS_RESOLVED), this._updateStatus.bind(this, STATUS_REJECTED));