Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10422 from timvandermeij/es6

Browse Source 
Convert more files in `src/core` to ES6 syntax
This commit is contained in:
Tim van der Meij 2019-01-06 15:06:57 +01:00 committed by GitHub
commit 968a153180
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 145 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/annotation.js
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* eslint no-var: error */
import {
AnnotationBorderStyleType, AnnotationFieldFlag, AnnotationFlag,

65
src/core/arithmetic_decoder.js
View File

@ -12,18 +12,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* eslint no-var: error */
/* This class implements the QM Coder decoding as defined in
* JPEG 2000 Part I Final Committee Draft Version 1.0
* Annex C.3 Arithmetic decoding procedure
* available at http://www.jpeg.org/public/fcd15444-1.pdf
*
* The arithmetic decoder is used in conjunction with context models to decode
* JPEG2000 and JBIG2 streams.
*/
var ArithmeticDecoder = (function ArithmeticDecoderClosure() {
// Table C-2
var QeTable = [
// Table C-2
const QeTable = [
{ qe: 0x5601, nmps: 1, nlps: 1, switchFlag: 1, },
{ qe: 0x3401, nmps: 2, nlps: 6, switchFlag: 0, },
{ qe: 0x1801, nmps: 3, nlps: 9, switchFlag: 0, },
@ -70,11 +62,21 @@ var ArithmeticDecoder = (function ArithmeticDecoderClosure() {
{ qe: 0x0009, nmps: 44, nlps: 41, switchFlag: 0, },
{ qe: 0x0005, nmps: 45, nlps: 42, switchFlag: 0, },
{ qe: 0x0001, nmps: 45, nlps: 43, switchFlag: 0, },
{ qe: 0x5601, nmps: 46, nlps: 46, switchFlag: 0, }
];
{ qe: 0x5601, nmps: 46, nlps: 46, switchFlag: 0, },
];
/**
* This class implements the QM Coder decoding as defined in
* JPEG 2000 Part I Final Committee Draft Version 1.0
* Annex C.3 Arithmetic decoding procedure
* available at http://www.jpeg.org/public/fcd15444-1.pdf
*
* The arithmetic decoder is used in conjunction with context models to decode
* JPEG2000 and JBIG2 streams.
*/
class ArithmeticDecoder {
// C.3.5 Initialisation of the decoder (INITDEC)
function ArithmeticDecoder(data, start, end) {
constructor(data, start, end) {
this.data = data;
this.bp = start;
this.dataEnd = end;
@ -90,14 +92,13 @@ var ArithmeticDecoder = (function ArithmeticDecoderClosure() {
this.a = 0x8000;
}
ArithmeticDecoder.prototype = {
// C.3.4 Compressed data input (BYTEIN)
byteIn: function ArithmeticDecoder_byteIn() {
var data = this.data;
var bp = this.bp;
byteIn() {
const data = this.data;
let bp = this.bp;
if (data[bp] === 0xFF) {
var b1 = data[bp + 1];
if (b1 > 0x8F) {
if (data[bp + 1] > 0x8F) {
this.clow += 0xFF00;
this.ct = 8;
} else {
@ -116,16 +117,17 @@ var ArithmeticDecoder = (function ArithmeticDecoderClosure() {
this.chigh += (this.clow >> 16);
this.clow &= 0xFFFF;
}
},
}
// C.3.2 Decoding a decision (DECODE)
readBit: function ArithmeticDecoder_readBit(contexts, pos) {
// contexts are packed into 1 byte:
readBit(contexts, pos) {
// Contexts are packed into 1 byte:
// highest 7 bits carry cx.index, lowest bit carries cx.mps
var cx_index = contexts[pos] >> 1, cx_mps = contexts[pos] & 1;
var qeTableIcx = QeTable[cx_index];
var qeIcx = qeTableIcx.qe;
var d;
var a = this.a - qeIcx;
let cx_index = contexts[pos] >> 1, cx_mps = contexts[pos] & 1;
const qeTableIcx = QeTable[cx_index];
const qeIcx = qeTableIcx.qe;
let d;
let a = this.a - qeIcx;
if (this.chigh < qeIcx) {
// exchangeLps
@ -174,11 +176,8 @@ var ArithmeticDecoder = (function ArithmeticDecoderClosure() {
contexts[pos] = cx_index << 1 | cx_mps;
return d;
},
};
return ArithmeticDecoder;
})();
}
}
export {
ArithmeticDecoder,

7
src/core/charsets.js
View File

@ -12,8 +12,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* eslint no-var: error */
var ISOAdobeCharset = [
const ISOAdobeCharset = [
'.notdef', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar',
'percent', 'ampersand', 'quoteright', 'parenleft', 'parenright',
'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash', 'zero',
@ -50,7 +51,7 @@ var ISOAdobeCharset = [
'ugrave', 'yacute', 'ydieresis', 'zcaron'
];
var ExpertCharset = [
const ExpertCharset = [
'.notdef', 'space', 'exclamsmall', 'Hungarumlautsmall', 'dollaroldstyle',
'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior',
'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma',
@ -90,7 +91,7 @@ var ExpertCharset = [
'Ydieresissmall'
];
var ExpertSubsetCharset = [
const ExpertSubsetCharset = [
'.notdef', 'space', 'dollaroldstyle', 'dollarsuperior',
'parenleftsuperior', 'parenrightsuperior', 'twodotenleader',
'onedotenleader', 'comma', 'hyphen', 'period', 'fraction',

1
src/core/ps_parser.js
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* eslint no-var: error */
import { FormatError, isSpace, shadow } from '../shared/util';
import { EOF } from './primitives';

15
src/core/standard_fonts.js
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* eslint no-var: error */
import { getLookupTableFactory } from '../shared/util';
@ -19,7 +20,7 @@ import { getLookupTableFactory } from '../shared/util';
* Hold a map of decoded fonts and of the standard fourteen Type1
* fonts and their acronyms.
*/
var getStdFontMap = getLookupTableFactory(function (t) {
const getStdFontMap = getLookupTableFactory(function (t) {
t['ArialNarrow'] = 'Helvetica';
t['ArialNarrow-Bold'] = 'Helvetica-Bold';
t['ArialNarrow-BoldItalic'] = 'Helvetica-BoldOblique';
@ -82,7 +83,7 @@ var getStdFontMap = getLookupTableFactory(function (t) {
* Holds the map of the non-standard fonts that might be included as
* a standard fonts without glyph data.
*/
var getNonStdFontMap = getLookupTableFactory(function (t) {
const getNonStdFontMap = getLookupTableFactory(function (t) {
t['Calibri'] = 'Helvetica';
t['Calibri-Bold'] = 'Helvetica-Bold';
t['Calibri-BoldItalic'] = 'Helvetica-BoldOblique';
@ -120,7 +121,7 @@ var getNonStdFontMap = getLookupTableFactory(function (t) {
t['Wingdings'] = 'ZapfDingbats';
});
var getSerifFonts = getLookupTableFactory(function (t) {
const getSerifFonts = getLookupTableFactory(function (t) {
t['Adobe Jenson'] = true;
t['Adobe Text'] = true;
t['Albertus'] = true;
@ -256,7 +257,7 @@ var getSerifFonts = getLookupTableFactory(function (t) {
t['XITS'] = true;
});
var getSymbolsFonts = getLookupTableFactory(function (t) {
const getSymbolsFonts = getLookupTableFactory(function (t) {
t['Dingbats'] = true;
t['Symbol'] = true;
t['ZapfDingbats'] = true;
@ -265,7 +266,7 @@ var getSymbolsFonts = getLookupTableFactory(function (t) {
// Glyph map for well-known standard fonts. Sometimes Ghostscript uses CID
// fonts, but does not embed the CID to GID mapping. The mapping is incomplete
// for all glyphs, but common for some set of the standard fonts.
var getGlyphMapForStandardFonts = getLookupTableFactory(function (t) {
const getGlyphMapForStandardFonts = getLookupTableFactory(function (t) {
t[2] = 10; t[3] = 32; t[4] = 33; t[5] = 34; t[6] = 35; t[7] = 36; t[8] = 37;
t[9] = 38; t[10] = 39; t[11] = 40; t[12] = 41; t[13] = 42; t[14] = 43;
t[15] = 44; t[16] = 45; t[17] = 46; t[18] = 47; t[19] = 48; t[20] = 49;
@ -355,7 +356,7 @@ var getGlyphMapForStandardFonts = getLookupTableFactory(function (t) {
// The glyph map for ArialBlack differs slightly from the glyph map used for
// other well-known standard fonts. Hence we use this (incomplete) CID to GID
// mapping to adjust the glyph map for non-embedded ArialBlack fonts.
var getSupplementalGlyphMapForArialBlack =
const getSupplementalGlyphMapForArialBlack =
getLookupTableFactory(function (t) {
t[227] = 322; t[264] = 261; t[291] = 346;
});
@ -363,7 +364,7 @@ var getSupplementalGlyphMapForArialBlack =
// The glyph map for Calibri (a Windows font) differs from the glyph map used
// in the standard fonts. Hence we use this (incomplete) CID to GID mapping to
// adjust the glyph map for non-embedded Calibri fonts.
let getSupplementalGlyphMapForCalibri = getLookupTableFactory(function(t) {
const getSupplementalGlyphMapForCalibri = getLookupTableFactory(function(t) {
t[1] = 32; t[4] = 65; t[17] = 66; t[18] = 67; t[24] = 68; t[28] = 69;
t[38] = 70; t[39] = 71; t[44] = 72; t[47] = 73; t[58] = 74; t[60] = 75;
t[62] = 76; t[68] = 77; t[69] = 78; t[75] = 79; t[87] = 80; t[89] = 81;