diff --git a/src/canvas.js b/src/canvas.js
index 286fd0e04..fdb537372 100644
--- a/src/canvas.js
+++ b/src/canvas.js
@@ -17,8 +17,8 @@ var TextRenderingMode = {
ADD_TO_PATH: 7
};
-var CanvasExtraState = (function canvasExtraState() {
- function constructor(old) {
+var CanvasExtraState = (function CanvasExtraStateClosure() {
+ function CanvasExtraState(old) {
// Are soft masks and alpha values shapes or opacities?
this.alphaIsShape = false;
this.fontSize = 0;
@@ -52,7 +52,7 @@ var CanvasExtraState = (function canvasExtraState() {
this.old = old;
}
- constructor.prototype = {
+ CanvasExtraState.prototype = {
clone: function canvasextra_clone() {
return Object.create(this);
},
@@ -61,7 +61,7 @@ var CanvasExtraState = (function canvasExtraState() {
this.y = y;
}
};
- return constructor;
+ return CanvasExtraState;
})();
function ScratchCanvas(width, height) {
@@ -181,12 +181,12 @@ function addContextCurrentTransform(ctx) {
}
}
-var CanvasGraphics = (function canvasGraphics() {
+var CanvasGraphics = (function CanvasGraphicsClosure() {
// Defines the time the executeIRQueue is going to be executing
// before it stops and shedules a continue of execution.
var kExecutionTime = 50;
- function constructor(canvasCtx, objs, textLayer) {
+ function CanvasGraphics(canvasCtx, objs, textLayer) {
this.ctx = canvasCtx;
this.current = new CanvasExtraState();
this.stateStack = [];
@@ -206,7 +206,7 @@ var CanvasGraphics = (function canvasGraphics() {
var NORMAL_CLIP = {};
var EO_CLIP = {};
- constructor.prototype = {
+ CanvasGraphics.prototype = {
slowCommands: {
'stroke': true,
'closeStroke': true,
@@ -1180,7 +1180,7 @@ var CanvasGraphics = (function canvasGraphics() {
}
};
- return constructor;
+ return CanvasGraphics;
})();
if (!isWorker) {
diff --git a/src/colorspace.js b/src/colorspace.js
index b369d0f88..231ff6923 100644
--- a/src/colorspace.js
+++ b/src/colorspace.js
@@ -3,13 +3,13 @@
'use strict';
-var ColorSpace = (function colorSpaceColorSpace() {
+var ColorSpace = (function ColorSpaceClosure() {
// Constructor should define this.numComps, this.defaultColor, this.name
- function constructor() {
+ function ColorSpace() {
error('should not call ColorSpace constructor');
}
- constructor.prototype = {
+ ColorSpace.prototype = {
// Input: array of size numComps representing color component values
// Output: array of rgb values, each value ranging from [0.1]
getRgb: function colorSpaceGetRgb(color) {
@@ -22,15 +22,15 @@ var ColorSpace = (function colorSpaceColorSpace() {
}
};
- constructor.parse = function colorSpaceParse(cs, xref, res) {
- var IR = constructor.parseToIR(cs, xref, res);
+ ColorSpace.parse = function colorSpaceParse(cs, xref, res) {
+ var IR = ColorSpace.parseToIR(cs, xref, res);
if (IR instanceof AlternateCS)
return IR;
- return constructor.fromIR(IR);
+ return ColorSpace.fromIR(IR);
};
- constructor.fromIR = function colorSpaceFromIR(IR) {
+ ColorSpace.fromIR = function colorSpaceFromIR(IR) {
var name = isArray(IR) ? IR[0] : IR;
switch (name) {
@@ -63,7 +63,7 @@ var ColorSpace = (function colorSpaceColorSpace() {
return null;
};
- constructor.parseToIR = function colorSpaceParseToIR(cs, xref, res) {
+ ColorSpace.parseToIR = function colorSpaceParseToIR(cs, xref, res) {
if (isName(cs)) {
var colorSpaces = xref.fetchIfRef(res.get('ColorSpace'));
if (isDict(colorSpaces)) {
@@ -155,7 +155,7 @@ var ColorSpace = (function colorSpaceColorSpace() {
return null;
};
- return constructor;
+ return ColorSpace;
})();
/**
@@ -164,8 +164,8 @@ var ColorSpace = (function colorSpaceColorSpace() {
* Both color spaces use a tinting function to convert colors to a base color
* space.
*/
-var AlternateCS = (function alternateCS() {
- function constructor(numComps, base, tintFn) {
+var AlternateCS = (function AlternateCSClosure() {
+ function AlternateCS(numComps, base, tintFn) {
this.name = 'Alternate';
this.numComps = numComps;
this.defaultColor = [];
@@ -175,7 +175,7 @@ var AlternateCS = (function alternateCS() {
this.tintFn = tintFn;
}
- constructor.prototype = {
+ AlternateCS.prototype = {
getRgb: function altcs_getRgb(color) {
var tinted = this.tintFn(color);
return this.base.getRgb(tinted);
@@ -203,21 +203,21 @@ var AlternateCS = (function alternateCS() {
}
};
- return constructor;
+ return AlternateCS;
})();
-var PatternCS = (function patternCS() {
- function constructor(baseCS) {
+var PatternCS = (function PatternCSClosure() {
+ function PatternCS(baseCS) {
this.name = 'Pattern';
this.base = baseCS;
}
- constructor.prototype = {};
+ PatternCS.prototype = {};
- return constructor;
+ return PatternCS;
})();
-var IndexedCS = (function indexedCS() {
- function constructor(base, highVal, lookup) {
+var IndexedCS = (function IndexedCSClosure() {
+ function IndexedCS(base, highVal, lookup) {
this.name = 'Indexed';
this.numComps = 1;
this.defaultColor = [0];
@@ -240,7 +240,7 @@ var IndexedCS = (function indexedCS() {
this.lookup = lookupArray;
}
- constructor.prototype = {
+ IndexedCS.prototype = {
getRgb: function indexcs_getRgb(color) {
var numComps = this.base.numComps;
var start = color[0] * numComps;
@@ -269,17 +269,17 @@ var IndexedCS = (function indexedCS() {
return base.getRgbBuffer(baseBuf, 8);
}
};
- return constructor;
+ return IndexedCS;
})();
-var DeviceGrayCS = (function deviceGrayCS() {
- function constructor() {
+var DeviceGrayCS = (function DeviceGrayCSClosure() {
+ function DeviceGrayCS() {
this.name = 'DeviceGray';
this.numComps = 1;
this.defaultColor = [0];
}
- constructor.prototype = {
+ DeviceGrayCS.prototype = {
getRgb: function graycs_getRgb(color) {
var c = color[0];
return [c, c, c];
@@ -297,16 +297,16 @@ var DeviceGrayCS = (function deviceGrayCS() {
return rgbBuf;
}
};
- return constructor;
+ return DeviceGrayCS;
})();
-var DeviceRgbCS = (function deviceRgbCS() {
- function constructor() {
+var DeviceRgbCS = (function DeviceRgbCSClosure() {
+ function DeviceRgbCS() {
this.name = 'DeviceRGB';
this.numComps = 3;
this.defaultColor = [0, 0, 0];
}
- constructor.prototype = {
+ DeviceRgbCS.prototype = {
getRgb: function rgbcs_getRgb(color) {
return color;
},
@@ -321,16 +321,16 @@ var DeviceRgbCS = (function deviceRgbCS() {
return rgbBuf;
}
};
- return constructor;
+ return DeviceRgbCS;
})();
-var DeviceCmykCS = (function deviceCmykCS() {
- function constructor() {
+var DeviceCmykCS = (function DeviceCmykCSClosure() {
+ function DeviceCmykCS() {
this.name = 'DeviceCMYK';
this.numComps = 4;
this.defaultColor = [0, 0, 0, 1];
}
- constructor.prototype = {
+ DeviceCmykCS.prototype = {
getRgb: function cmykcs_getRgb(color) {
var c = color[0], m = color[1], y = color[2], k = color[3];
var c1 = 1 - c, m1 = 1 - m, y1 = 1 - y, k1 = 1 - k;
@@ -406,6 +406,6 @@ var DeviceCmykCS = (function deviceCmykCS() {
}
};
- return constructor;
+ return DeviceCmykCS;
})();
diff --git a/src/core.js b/src/core.js
index 5faee59c7..9f3e6b837 100644
--- a/src/core.js
+++ b/src/core.js
@@ -56,8 +56,8 @@ function getPdf(arg, callback) {
}
globalScope.PDFJS.getPdf = getPdf;
-var Page = (function pagePage() {
- function constructor(xref, pageNumber, pageDict, ref) {
+var Page = (function PageClosure() {
+ function Page(xref, pageNumber, pageDict, ref) {
this.pageNumber = pageNumber;
this.pageDict = pageDict;
this.stats = {
@@ -74,7 +74,7 @@ var Page = (function pagePage() {
this.callback = null;
}
- constructor.prototype = {
+ Page.prototype = {
getPageProp: function pageGetPageProp(key) {
return this.xref.fetchIfRef(this.pageDict.get(key));
},
@@ -325,7 +325,7 @@ var Page = (function pagePage() {
}
};
- return constructor;
+ return Page;
})();
/**
@@ -338,8 +338,8 @@ var Page = (function pagePage() {
* need for the `PDFDocModel` anymore and there is only one object on the
* main thread and not one entire copy on each worker instance.
*/
-var PDFDocModel = (function pdfDoc() {
- function constructor(arg, callback) {
+var PDFDocModel = (function PDFDocModelClosure() {
+ function PDFDocModel(arg, callback) {
if (isStream(arg))
init.call(this, arg);
else if (isArrayBuffer(arg))
@@ -370,7 +370,7 @@ var PDFDocModel = (function pdfDoc() {
return true; /* found */
}
- constructor.prototype = {
+ PDFDocModel.prototype = {
get linearization() {
var length = this.stream.length;
var linearization = false;
@@ -392,12 +392,17 @@ var PDFDocModel = (function pdfDoc() {
if (find(stream, 'endobj', 1024))
startXRef = stream.pos + 6;
} else {
- // Find startxref at the end of the file.
- var start = stream.end - 1024;
- if (start < 0)
- start = 0;
- stream.pos = start;
- if (find(stream, 'startxref', 1024, true)) {
+ // Find startxref by jumping backward from the end of the file.
+ var step = 1024;
+ var found = false, pos = stream.end;
+ while (!found && pos > 0) {
+ pos -= step - 'startxref'.length;
+ if (pos < 0)
+ pos = 0;
+ stream.pos = pos;
+ found = find(stream, 'startxref', step, true);
+ }
+ if (found) {
stream.skip(9);
var ch;
do {
@@ -454,11 +459,11 @@ var PDFDocModel = (function pdfDoc() {
}
};
- return constructor;
+ return PDFDocModel;
})();
-var PDFDoc = (function pdfDoc() {
- function constructor(arg, callback) {
+var PDFDoc = (function PDFDocClosure() {
+ function PDFDoc(arg, callback) {
var stream = null;
var data = null;
@@ -526,7 +531,7 @@ var PDFDoc = (function pdfDoc() {
}
}
- constructor.prototype = {
+ PDFDoc.prototype = {
setupFakeWorker: function() {
// If we don't use a worker, just post/sendMessage to the main thread.
var fakeWorker = {
@@ -655,7 +660,7 @@ var PDFDoc = (function pdfDoc() {
}
};
- return constructor;
+ return PDFDoc;
})();
globalScope.PDFJS.PDFDoc = PDFDoc;
diff --git a/src/crypto.js b/src/crypto.js
index 955598644..7c34a8506 100644
--- a/src/crypto.js
+++ b/src/crypto.js
@@ -3,8 +3,8 @@
'use strict';
-var ARCFourCipher = (function arcFourCipher() {
- function constructor(key) {
+var ARCFourCipher = (function ARCFourCipherClosure() {
+ function ARCFourCipher(key) {
this.a = 0;
this.b = 0;
var s = new Uint8Array(256);
@@ -20,7 +20,7 @@ var ARCFourCipher = (function arcFourCipher() {
this.s = s;
}
- constructor.prototype = {
+ ARCFourCipher.prototype = {
encryptBlock: function arcFourCipherEncryptBlock(data) {
var i, n = data.length, tmp, tmp2;
var a = this.a, b = this.b, s = this.s;
@@ -39,12 +39,12 @@ var ARCFourCipher = (function arcFourCipher() {
return output;
}
};
- constructor.prototype.decryptBlock = constructor.prototype.encryptBlock;
+ ARCFourCipher.prototype.decryptBlock = ARCFourCipher.prototype.encryptBlock;
- return constructor;
+ return ARCFourCipher;
})();
-var calculateMD5 = (function calculateMD5() {
+var calculateMD5 = (function calculateMD5Closure() {
var r = new Uint8Array([
7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22,
5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20,
@@ -128,20 +128,20 @@ var calculateMD5 = (function calculateMD5() {
return hash;
})();
-var NullCipher = (function nullCipher() {
- function constructor() {
+var NullCipher = (function NullCipherClosure() {
+ function NullCipher() {
}
- constructor.prototype = {
+ NullCipher.prototype = {
decryptBlock: function nullCipherDecryptBlock(data) {
return data;
}
};
- return constructor;
+ return NullCipher;
})();
-var AES128Cipher = (function aes128Cipher() {
+var AES128Cipher = (function AES128CipherClosure() {
var rcon = new Uint8Array([
0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c,
0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a,
@@ -330,7 +330,7 @@ var AES128Cipher = (function aes128Cipher() {
return state;
}
- function constructor(key) {
+ function AES128Cipher(key) {
this.key = expandKey128(key);
this.buffer = new Uint8Array(16);
this.bufferPosition = 0;
@@ -370,7 +370,7 @@ var AES128Cipher = (function aes128Cipher() {
return output;
}
- constructor.prototype = {
+ AES128Cipher.prototype = {
decryptBlock: function aes128CipherDecryptBlock(data) {
var i, sourceLength = data.length;
var buffer = this.buffer, bufferLength = this.bufferPosition;
@@ -391,15 +391,15 @@ var AES128Cipher = (function aes128Cipher() {
}
};
- return constructor;
+ return AES128Cipher;
})();
-var CipherTransform = (function cipherTransform() {
- function constructor(stringCipherConstructor, streamCipherConstructor) {
+var CipherTransform = (function CipherTransformClosure() {
+ function CipherTransform(stringCipherConstructor, streamCipherConstructor) {
this.stringCipherConstructor = stringCipherConstructor;
this.streamCipherConstructor = streamCipherConstructor;
}
- constructor.prototype = {
+ CipherTransform.prototype = {
createStream: function cipherTransformCreateStream(stream) {
var cipher = new this.streamCipherConstructor();
return new DecryptStream(stream,
@@ -415,10 +415,10 @@ var CipherTransform = (function cipherTransform() {
return bytesToString(data);
}
};
- return constructor;
+ return CipherTransform;
})();
-var CipherTransformFactory = (function cipherTransformFactory() {
+var CipherTransformFactory = (function CipherTransformFactoryClosure() {
function prepareKeyData(fileId, password, ownerPassword, userPassword,
flags, revision, keyLength, encryptMetadata) {
var defaultPasswordBytes = new Uint8Array([
@@ -490,7 +490,7 @@ var CipherTransformFactory = (function cipherTransformFactory() {
var identityName = new Name('Identity');
- function constructor(dict, fileId, password) {
+ function CipherTransformFactory(dict, fileId, password) {
var filter = dict.get('Filter');
if (!isName(filter) || filter.name != 'Standard')
error('unknown encryption method');
@@ -573,7 +573,7 @@ var CipherTransformFactory = (function cipherTransformFactory() {
return null;
}
- constructor.prototype = {
+ CipherTransformFactory.prototype = {
createCipherTransform: function buildCipherCreateCipherTransform(num,
gen) {
if (this.algorithm == 4) {
@@ -592,6 +592,6 @@ var CipherTransformFactory = (function cipherTransformFactory() {
}
};
- return constructor;
+ return CipherTransformFactory;
})();
diff --git a/src/evaluator.js b/src/evaluator.js
index 954c3bec3..a5ca627c5 100644
--- a/src/evaluator.js
+++ b/src/evaluator.js
@@ -3,8 +3,8 @@
'use strict';
-var PartialEvaluator = (function partialEvaluator() {
- function constructor(xref, handler, uniquePrefix) {
+var PartialEvaluator = (function PartialEvaluatorClosure() {
+ function PartialEvaluator(xref, handler, uniquePrefix) {
this.state = new EvalState();
this.stateStack = [];
@@ -111,7 +111,7 @@ var PartialEvaluator = (function partialEvaluator() {
EX: 'endCompat'
};
- constructor.prototype = {
+ PartialEvaluator.prototype = {
getIRQueue: function partialEvaluatorGetIRQueue(stream, resources,
queue, dependency) {
@@ -858,11 +858,11 @@ var PartialEvaluator = (function partialEvaluator() {
}
};
- return constructor;
+ return PartialEvaluator;
})();
-var EvalState = (function evalState() {
- function constructor() {
+var EvalState = (function EvalStateClosure() {
+ function EvalState() {
// Are soft masks and alpha values shapes or opacities?
this.alphaIsShape = false;
this.fontSize = 0;
@@ -879,8 +879,8 @@ var EvalState = (function evalState() {
this.fillColorSpace = null;
this.strokeColorSpace = null;
}
- constructor.prototype = {
+ EvalState.prototype = {
};
- return constructor;
+ return EvalState;
})();
diff --git a/src/fonts.js b/src/fonts.js
index f83d1e80d..fcec676cb 100644
--- a/src/fonts.js
+++ b/src/fonts.js
@@ -731,8 +731,8 @@ function isSpecialUnicode(unicode) {
* var type1Font = new Font("MyFontName", binaryFile, propertiesObject);
* type1Font.bind();
*/
-var Font = (function Font() {
- var constructor = function font_constructor(name, file, properties) {
+var Font = (function FontClosure() {
+ function Font(name, file, properties) {
this.name = name;
this.coded = properties.coded;
this.charProcIRQueues = properties.charProcIRQueues;
@@ -1229,7 +1229,7 @@ var Font = (function Font() {
return nameTable;
}
- constructor.prototype = {
+ Font.prototype = {
name: null,
font: null,
mimetype: null,
@@ -2218,7 +2218,7 @@ var Font = (function Font() {
}
};
- return constructor;
+ return Font;
})();
/*
@@ -3128,9 +3128,9 @@ CFF.prototype = {
}
};
-var Type2CFF = (function type2CFF() {
+var Type2CFF = (function Type2CFFClosure() {
// TODO: replace parsing code with the Type2Parser in font_utils.js
- function constructor(file, properties) {
+ function Type2CFF(file, properties) {
var bytes = file.getBytes();
this.bytes = bytes;
this.properties = properties;
@@ -3138,7 +3138,7 @@ var Type2CFF = (function type2CFF() {
this.data = this.parse();
}
- constructor.prototype = {
+ Type2CFF.prototype = {
parse: function cff_parse() {
var header = this.parseHeader();
var properties = this.properties;
@@ -3682,6 +3682,6 @@ var Type2CFF = (function type2CFF() {
}
};
- return constructor;
+ return Type2CFF;
})();
diff --git a/src/function.js b/src/function.js
index ef24736c1..6b0063218 100644
--- a/src/function.js
+++ b/src/function.js
@@ -3,7 +3,7 @@
'use strict';
-var PDFFunction = (function pdfFunction() {
+var PDFFunction = (function PDFFunctionClosure() {
var CONSTRUCT_SAMPLED = 0;
var CONSTRUCT_INTERPOLATED = 2;
var CONSTRUCT_STICHED = 3;
diff --git a/src/image.js b/src/image.js
index 217e081c2..15c31b034 100644
--- a/src/image.js
+++ b/src/image.js
@@ -3,8 +3,8 @@
'use strict';
-var PDFImage = (function pdfImage() {
- function constructor(xref, res, image, inline) {
+var PDFImage = (function PDFImageClosure() {
+ function PDFImage(xref, res, image, inline) {
this.image = image;
if (image.getParams) {
// JPX/JPEG2000 streams directly contain bits per component
@@ -60,7 +60,7 @@ var PDFImage = (function pdfImage() {
}
}
- constructor.prototype = {
+ PDFImage.prototype = {
getComponents: function getComponents(buffer, decodeMap) {
var bpc = this.bpc;
if (bpc == 8)
@@ -226,7 +226,7 @@ var PDFImage = (function pdfImage() {
buffer[i] = comps[i];
}
};
- return constructor;
+ return PDFImage;
})();
function loadJpegStream(id, imageData, objs) {
@@ -236,3 +236,4 @@ function loadJpegStream(id, imageData, objs) {
});
img.src = 'data:image/jpeg;base64,' + window.btoa(imageData);
}
+
diff --git a/src/obj.js b/src/obj.js
index 9d32956b7..2f7488a76 100644
--- a/src/obj.js
+++ b/src/obj.js
@@ -3,34 +3,34 @@
'use strict';
-var Name = (function nameName() {
- function constructor(name) {
+var Name = (function NameClosure() {
+ function Name(name) {
this.name = name;
}
- constructor.prototype = {
+ Name.prototype = {
};
- return constructor;
+ return Name;
})();
-var Cmd = (function cmdCmd() {
- function constructor(cmd) {
+var Cmd = (function CmdClosure() {
+ function Cmd(cmd) {
this.cmd = cmd;
}
- constructor.prototype = {
+ Cmd.prototype = {
};
- return constructor;
+ return Cmd;
})();
-var Dict = (function dictDict() {
- function constructor() {
+var Dict = (function DictClosure() {
+ function Dict() {
this.map = Object.create(null);
}
- constructor.prototype = {
+ Dict.prototype = {
get: function dictGet(key1, key2, key3) {
var value;
if (typeof (value = this.map[key1]) != 'undefined' || key1 in this.map ||
@@ -60,29 +60,29 @@ var Dict = (function dictDict() {
}
};
- return constructor;
+ return Dict;
})();
-var Ref = (function refRef() {
- function constructor(num, gen) {
+var Ref = (function RefClosure() {
+ function Ref(num, gen) {
this.num = num;
this.gen = gen;
}
- constructor.prototype = {
+ Ref.prototype = {
};
- return constructor;
+ return Ref;
})();
// The reference is identified by number and generation,
// this structure stores only one instance of the reference.
-var RefSet = (function refSet() {
- function constructor() {
+var RefSet = (function RefSetClosure() {
+ function RefSet() {
this.dict = {};
}
- constructor.prototype = {
+ RefSet.prototype = {
has: function refSetHas(ref) {
return !!this.dict['R' + ref.num + '.' + ref.gen];
},
@@ -92,18 +92,18 @@ var RefSet = (function refSet() {
}
};
- return constructor;
+ return RefSet;
})();
-var Catalog = (function catalogCatalog() {
- function constructor(xref) {
+var Catalog = (function CatalogClosure() {
+ function Catalog(xref) {
this.xref = xref;
var obj = xref.getCatalogObj();
assertWellFormed(isDict(obj), 'catalog object is not a dictionary');
this.catDict = obj;
}
- constructor.prototype = {
+ Catalog.prototype = {
get toplevelPagesDict() {
var pagesObj = this.catDict.get('Pages');
assertWellFormed(isRef(pagesObj), 'invalid top-level pages reference');
@@ -253,11 +253,11 @@ var Catalog = (function catalogCatalog() {
}
};
- return constructor;
+ return Catalog;
})();
-var XRef = (function xRefXRef() {
- function constructor(stream, startXRef, mainXRefEntriesOffset) {
+var XRef = (function XRefClosure() {
+ function XRef(stream, startXRef, mainXRefEntriesOffset) {
this.stream = stream;
this.entries = [];
this.xrefstms = {};
@@ -278,7 +278,7 @@ var XRef = (function xRefXRef() {
error('Invalid root reference');
}
- constructor.prototype = {
+ XRef.prototype = {
readXRefTable: function readXRefTable(parser) {
var obj;
while (true) {
@@ -642,7 +642,7 @@ var XRef = (function xRefXRef() {
}
};
- return constructor;
+ return XRef;
})();
/**
@@ -651,7 +651,7 @@ var XRef = (function xRefXRef() {
* inside of a worker. The `PDFObjects` implements some basic functions to
* manage these objects.
*/
-var PDFObjects = (function pdfObjects() {
+var PDFObjects = (function PDFObjectsClosure() {
function PDFObjects() {
this.objs = {};
}
diff --git a/src/parser.js b/src/parser.js
index 036191677..6ffae0b1c 100644
--- a/src/parser.js
+++ b/src/parser.js
@@ -9,8 +9,8 @@ function isEOF(v) {
return v == EOF;
}
-var Parser = (function parserParser() {
- function constructor(lexer, allowStreams, xref) {
+var Parser = (function ParserClosure() {
+ function Parser(lexer, allowStreams, xref) {
this.lexer = lexer;
this.allowStreams = allowStreams;
this.xref = xref;
@@ -18,7 +18,7 @@ var Parser = (function parserParser() {
this.refill();
}
- constructor.prototype = {
+ Parser.prototype = {
refill: function parserRefill() {
this.buf1 = this.lexer.getObj();
this.buf2 = this.lexer.getObj();
@@ -254,15 +254,15 @@ var Parser = (function parserParser() {
}
};
- return constructor;
+ return Parser;
})();
-var Lexer = (function lexer() {
- function constructor(stream) {
+var Lexer = (function LexerClosure() {
+ function Lexer(stream) {
this.stream = stream;
}
- constructor.isSpace = function lexerIsSpace(ch) {
+ Lexer.isSpace = function lexerIsSpace(ch) {
return ch == ' ' || ch == '\t' || ch == '\x0d' || ch == '\x0a';
};
@@ -296,7 +296,7 @@ var Lexer = (function lexer() {
return -1;
}
- constructor.prototype = {
+ Lexer.prototype = {
getNumber: function lexerGetNumber(ch) {
var floating = false;
var str = ch;
@@ -558,11 +558,11 @@ var Lexer = (function lexer() {
}
};
- return constructor;
+ return Lexer;
})();
-var Linearization = (function linearizationLinearization() {
- function constructor(stream) {
+var Linearization = (function LinearizationClosure() {
+ function Linearization(stream) {
this.parser = new Parser(new Lexer(stream), false);
var obj1 = this.parser.getObj();
var obj2 = this.parser.getObj();
@@ -576,7 +576,7 @@ var Linearization = (function linearizationLinearization() {
}
}
- constructor.prototype = {
+ Linearization.prototype = {
getInt: function linearizationGetInt(name) {
var linDict = this.linDict;
var obj;
@@ -635,6 +635,6 @@ var Linearization = (function linearizationLinearization() {
}
};
- return constructor;
+ return Linearization;
})();
diff --git a/src/pattern.js b/src/pattern.js
index aa4667e07..dbe2e5c23 100644
--- a/src/pattern.js
+++ b/src/pattern.js
@@ -8,13 +8,13 @@ var PatternType = {
RADIAL: 3
};
-var Pattern = (function patternPattern() {
+var Pattern = (function PatternClosure() {
// Constructor should define this.getPattern
- function constructor() {
+ function Pattern() {
error('should not call Pattern constructor');
}
- constructor.prototype = {
+ Pattern.prototype = {
// Input: current Canvas context
// Output: the appropriate fillStyle or strokeStyle
getPattern: function pattern_getStyle(ctx) {
@@ -22,11 +22,11 @@ var Pattern = (function patternPattern() {
}
};
- constructor.shadingFromIR = function pattern_shadingFromIR(ctx, raw) {
+ Pattern.shadingFromIR = function pattern_shadingFromIR(ctx, raw) {
return Shadings[raw[0]].fromIR(ctx, raw);
};
- constructor.parseShading = function pattern_shading(shading, matrix, xref,
+ Pattern.parseShading = function pattern_shading(shading, matrix, xref,
res, ctx) {
var dict = isStream(shading) ? shading.dict : shading;
@@ -41,15 +41,15 @@ var Pattern = (function patternPattern() {
return new Shadings.Dummy();
}
};
- return constructor;
+ return Pattern;
})();
var Shadings = {};
// Radial and axial shading have very similar implementations
// If needed, the implementations can be broken into two classes
-Shadings.RadialAxial = (function radialAxialShading() {
- function constructor(dict, matrix, xref, res, ctx) {
+Shadings.RadialAxial = (function RadialAxialClosure() {
+ function RadialAxial(dict, matrix, xref, res, ctx) {
this.matrix = matrix;
this.coordsArr = dict.get('Coords');
this.shadingType = dict.get('ShadingType');
@@ -102,7 +102,7 @@ Shadings.RadialAxial = (function radialAxialShading() {
this.colorStops = colorStops;
}
- constructor.fromIR = function radialAxialShadingGetIR(ctx, raw) {
+ RadialAxial.fromIR = function radialAxialShadingGetIR(ctx, raw) {
var type = raw[1];
var colorStops = raw[2];
var p0 = raw[3];
@@ -134,7 +134,7 @@ Shadings.RadialAxial = (function radialAxialShading() {
return grad;
};
- constructor.prototype = {
+ RadialAxial.prototype = {
getIR: function radialAxialShadingGetIR() {
var coordsArr = this.coordsArr;
var type = this.shadingType;
@@ -162,27 +162,27 @@ Shadings.RadialAxial = (function radialAxialShading() {
}
};
- return constructor;
+ return RadialAxial;
})();
-Shadings.Dummy = (function dummyShading() {
- function constructor() {
+Shadings.Dummy = (function DummyClosure() {
+ function Dummy() {
this.type = 'Pattern';
}
- constructor.fromIR = function dummyShadingFromIR() {
+ Dummy.fromIR = function dummyShadingFromIR() {
return 'hotpink';
};
- constructor.prototype = {
+ Dummy.prototype = {
getIR: function dummyShadingGetIR() {
return ['Dummy'];
}
};
- return constructor;
+ return Dummy;
})();
-var TilingPattern = (function tilingPattern() {
+var TilingPattern = (function TilingPatternClosure() {
var PaintType = {
COLORED: 1,
UNCOLORED: 2
diff --git a/src/stream.js b/src/stream.js
index 559fb2ca2..d996f5c91 100644
--- a/src/stream.js
+++ b/src/stream.js
@@ -3,8 +3,8 @@
'use strict';
-var Stream = (function streamStream() {
- function constructor(arrayBuffer, start, length, dict) {
+var Stream = (function StreamClosure() {
+ function Stream(arrayBuffer, start, length, dict) {
this.bytes = new Uint8Array(arrayBuffer);
this.start = start || 0;
this.pos = this.start;
@@ -14,7 +14,7 @@ var Stream = (function streamStream() {
// required methods for a stream. if a particular stream does not
// implement these, an error should be thrown
- constructor.prototype = {
+ Stream.prototype = {
get length() {
return this.end - this.start;
},
@@ -67,11 +67,11 @@ var Stream = (function streamStream() {
isStream: true
};
- return constructor;
+ return Stream;
})();
-var StringStream = (function stringStream() {
- function constructor(str) {
+var StringStream = (function StringStreamClosure() {
+ function StringStream(str) {
var length = str.length;
var bytes = new Uint8Array(length);
for (var n = 0; n < length; ++n)
@@ -79,21 +79,21 @@ var StringStream = (function stringStream() {
Stream.call(this, bytes);
}
- constructor.prototype = Stream.prototype;
+ StringStream.prototype = Stream.prototype;
- return constructor;
+ return StringStream;
})();
// super class for the decoding streams
-var DecodeStream = (function decodeStream() {
- function constructor() {
+var DecodeStream = (function DecodeStreamClosure() {
+ function DecodeStream() {
this.pos = 0;
this.bufferLength = 0;
this.eof = false;
this.buffer = null;
}
- constructor.prototype = {
+ DecodeStream.prototype = {
ensureBuffer: function decodestream_ensureBuffer(requested) {
var buffer = this.buffer;
var current = buffer ? buffer.byteLength : 0;
@@ -178,24 +178,24 @@ var DecodeStream = (function decodeStream() {
}
};
- return constructor;
+ return DecodeStream;
})();
-var FakeStream = (function fakeStream() {
- function constructor(stream) {
+var FakeStream = (function FakeStreamClosure() {
+ function FakeStream(stream) {
this.dict = stream.dict;
DecodeStream.call(this);
}
- constructor.prototype = Object.create(DecodeStream.prototype);
- constructor.prototype.readBlock = function fakeStreamReadBlock() {
+ FakeStream.prototype = Object.create(DecodeStream.prototype);
+ FakeStream.prototype.readBlock = function fakeStreamReadBlock() {
var bufferLength = this.bufferLength;
bufferLength += 1024;
var buffer = this.ensureBuffer(bufferLength);
this.bufferLength = bufferLength;
};
- constructor.prototype.getBytes = function fakeStreamGetBytes(length) {
+ FakeStream.prototype.getBytes = function fakeStreamGetBytes(length) {
var end, pos = this.pos;
if (length) {
@@ -217,18 +217,20 @@ var FakeStream = (function fakeStream() {
return this.buffer.subarray(pos, end);
};
- return constructor;
+ return FakeStream;
})();
-var StreamsSequenceStream = (function streamSequenceStream() {
- function constructor(streams) {
+var StreamsSequenceStream = (function StreamsSequenceStreamClosure() {
+ function StreamsSequenceStream(streams) {
this.streams = streams;
DecodeStream.call(this);
}
- constructor.prototype = Object.create(DecodeStream.prototype);
+ StreamsSequenceStream.prototype = Object.create(DecodeStream.prototype);
+
+ StreamsSequenceStream.prototype.readBlock =
+ function streamSequenceStreamReadBlock() {
- constructor.prototype.readBlock = function streamSequenceStreamReadBlock() {
var streams = this.streams;
if (streams.length == 0) {
this.eof = true;
@@ -243,10 +245,10 @@ var StreamsSequenceStream = (function streamSequenceStream() {
this.bufferLength = newLength;
};
- return constructor;
+ return StreamsSequenceStream;
})();
-var FlateStream = (function flateStream() {
+var FlateStream = (function FlateStreamClosure() {
var codeLenCodeMap = new Uint32Array([
16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
]);
@@ -339,7 +341,7 @@ var FlateStream = (function flateStream() {
0x50003, 0x50013, 0x5000b, 0x5001b, 0x50007, 0x50017, 0x5000f, 0x00000
]), 5];
- function constructor(stream) {
+ function FlateStream(stream) {
var bytes = stream.getBytes();
var bytesPos = 0;
@@ -364,9 +366,9 @@ var FlateStream = (function flateStream() {
DecodeStream.call(this);
}
- constructor.prototype = Object.create(DecodeStream.prototype);
+ FlateStream.prototype = Object.create(DecodeStream.prototype);
- constructor.prototype.getBits = function flateStreamGetBits(bits) {
+ FlateStream.prototype.getBits = function flateStreamGetBits(bits) {
var codeSize = this.codeSize;
var codeBuf = this.codeBuf;
var bytes = this.bytes;
@@ -386,7 +388,7 @@ var FlateStream = (function flateStream() {
return b;
};
- constructor.prototype.getCode = function flateStreamGetCode(table) {
+ FlateStream.prototype.getCode = function flateStreamGetCode(table) {
var codes = table[0];
var maxLen = table[1];
var codeSize = this.codeSize;
@@ -412,7 +414,7 @@ var FlateStream = (function flateStream() {
return codeVal;
};
- constructor.prototype.generateHuffmanTable =
+ FlateStream.prototype.generateHuffmanTable =
function flateStreamGenerateHuffmanTable(lengths) {
var n = lengths.length;
@@ -451,7 +453,7 @@ var FlateStream = (function flateStream() {
return [codes, maxLen];
};
- constructor.prototype.readBlock = function flateStreamReadBlock() {
+ FlateStream.prototype.readBlock = function flateStreamReadBlock() {
// read block header
var hdr = this.getBits(3);
if (hdr & 1)
@@ -582,11 +584,11 @@ var FlateStream = (function flateStream() {
}
};
- return constructor;
+ return FlateStream;
})();
-var PredictorStream = (function predictorStream() {
- function constructor(stream, params) {
+var PredictorStream = (function PredictorStreamClosure() {
+ function PredictorStream(stream, params) {
var predictor = this.predictor = params.get('Predictor') || 1;
if (predictor <= 1)
@@ -613,9 +615,9 @@ var PredictorStream = (function predictorStream() {
return this;
}
- constructor.prototype = Object.create(DecodeStream.prototype);
+ PredictorStream.prototype = Object.create(DecodeStream.prototype);
- constructor.prototype.readBlockTiff =
+ PredictorStream.prototype.readBlockTiff =
function predictorStreamReadBlockTiff() {
var rowBytes = this.rowBytes;
@@ -676,7 +678,9 @@ var PredictorStream = (function predictorStream() {
this.bufferLength += rowBytes;
};
- constructor.prototype.readBlockPng = function predictorStreamReadBlockPng() {
+ PredictorStream.prototype.readBlockPng =
+ function predictorStreamReadBlockPng() {
+
var rowBytes = this.rowBytes;
var pixBytes = this.pixBytes;
@@ -753,7 +757,7 @@ var PredictorStream = (function predictorStream() {
this.bufferLength += rowBytes;
};
- return constructor;
+ return PredictorStream;
})();
/**
@@ -763,7 +767,7 @@ var PredictorStream = (function predictorStream() {
* a library to decode these images and the stream behaves like all the other
* DecodeStreams.
*/
-var JpegStream = (function jpegStream() {
+var JpegStream = (function JpegStreamClosure() {
function isAdobeImage(bytes) {
var maxBytesScanned = Math.max(bytes.length - 16, 1024);
// Looking for APP14, 'Adobe'
@@ -794,7 +798,7 @@ var JpegStream = (function jpegStream() {
return newBytes;
}
- function constructor(bytes, dict, xref) {
+ function JpegStream(bytes, dict, xref) {
// TODO: per poppler, some images may have 'junk' before that
// need to be removed
this.dict = dict;
@@ -825,9 +829,9 @@ var JpegStream = (function jpegStream() {
DecodeStream.call(this);
}
- constructor.prototype = Object.create(DecodeStream.prototype);
+ JpegStream.prototype = Object.create(DecodeStream.prototype);
- constructor.prototype.ensureBuffer = function jpegStreamEnsureBuffer(req) {
+ JpegStream.prototype.ensureBuffer = function jpegStreamEnsureBuffer(req) {
if (this.bufferLength)
return;
var jpegImage = new JpegImage();
@@ -839,18 +843,18 @@ var JpegStream = (function jpegStream() {
this.buffer = data;
this.bufferLength = data.length;
};
- constructor.prototype.getIR = function jpegStreamGetIR() {
+ JpegStream.prototype.getIR = function jpegStreamGetIR() {
return this.src;
};
- constructor.prototype.getChar = function jpegStreamGetChar() {
+ JpegStream.prototype.getChar = function jpegStreamGetChar() {
error('internal error: getChar is not valid on JpegStream');
};
- return constructor;
+ return JpegStream;
})();
-var DecryptStream = (function decryptStream() {
- function constructor(str, decrypt) {
+var DecryptStream = (function DecryptStreamClosure() {
+ function DecryptStream(str, decrypt) {
this.str = str;
this.dict = str.dict;
this.decrypt = decrypt;
@@ -860,9 +864,9 @@ var DecryptStream = (function decryptStream() {
var chunkSize = 512;
- constructor.prototype = Object.create(DecodeStream.prototype);
+ DecryptStream.prototype = Object.create(DecodeStream.prototype);
- constructor.prototype.readBlock = function decryptStreamReadBlock() {
+ DecryptStream.prototype.readBlock = function decryptStreamReadBlock() {
var chunk = this.str.getBytes(chunkSize);
if (!chunk || chunk.length == 0) {
this.eof = true;
@@ -879,11 +883,11 @@ var DecryptStream = (function decryptStream() {
this.bufferLength = bufferLength;
};
- return constructor;
+ return DecryptStream;
})();
-var Ascii85Stream = (function ascii85Stream() {
- function constructor(str) {
+var Ascii85Stream = (function Ascii85StreamClosure() {
+ function Ascii85Stream(str) {
this.str = str;
this.dict = str.dict;
this.input = new Uint8Array(5);
@@ -891,9 +895,9 @@ var Ascii85Stream = (function ascii85Stream() {
DecodeStream.call(this);
}
- constructor.prototype = Object.create(DecodeStream.prototype);
+ Ascii85Stream.prototype = Object.create(DecodeStream.prototype);
- constructor.prototype.readBlock = function ascii85StreamReadBlock() {
+ Ascii85Stream.prototype.readBlock = function ascii85StreamReadBlock() {
var tildaCode = '~'.charCodeAt(0);
var zCode = 'z'.charCodeAt(0);
var str = this.str;
@@ -948,11 +952,11 @@ var Ascii85Stream = (function ascii85Stream() {
}
};
- return constructor;
+ return Ascii85Stream;
})();
-var AsciiHexStream = (function asciiHexStream() {
- function constructor(str) {
+var AsciiHexStream = (function AsciiHexStreamClosure() {
+ function AsciiHexStream(str) {
this.str = str;
this.dict = str.dict;
@@ -986,9 +990,9 @@ var AsciiHexStream = (function asciiHexStream() {
102: 15
};
- constructor.prototype = Object.create(DecodeStream.prototype);
+ AsciiHexStream.prototype = Object.create(DecodeStream.prototype);
- constructor.prototype.readBlock = function asciiHexStreamReadBlock() {
+ AsciiHexStream.prototype.readBlock = function asciiHexStreamReadBlock() {
var gtCode = '>'.charCodeAt(0), bytes = this.str.getBytes(), c, n,
decodeLength, buffer, bufferLength, i, length;
@@ -1018,10 +1022,10 @@ var AsciiHexStream = (function asciiHexStream() {
this.eof = true;
};
- return constructor;
+ return AsciiHexStream;
})();
-var CCITTFaxStream = (function ccittFaxStream() {
+var CCITTFaxStream = (function CCITTFaxStreamClosure() {
var ccittEOL = -2;
var twoDimPass = 0;
@@ -1449,7 +1453,7 @@ var CCITTFaxStream = (function ccittFaxStream() {
[2, 2], [2, 2], [2, 2], [2, 2]
];
- function constructor(str, params) {
+ function CCITTFaxStream(str, params) {
this.str = str;
this.dict = str.dict;
@@ -1494,9 +1498,9 @@ var CCITTFaxStream = (function ccittFaxStream() {
DecodeStream.call(this);
}
- constructor.prototype = Object.create(DecodeStream.prototype);
+ CCITTFaxStream.prototype = Object.create(DecodeStream.prototype);
- constructor.prototype.readBlock = function ccittFaxStreamReadBlock() {
+ CCITTFaxStream.prototype.readBlock = function ccittFaxStreamReadBlock() {
while (!this.eof) {
var c = this.lookChar();
this.buf = EOF;
@@ -1505,7 +1509,7 @@ var CCITTFaxStream = (function ccittFaxStream() {
}
};
- constructor.prototype.addPixels =
+ CCITTFaxStream.prototype.addPixels =
function ccittFaxStreamAddPixels(a1, blackPixels) {
var codingLine = this.codingLine;
var codingPos = this.codingPos;
@@ -1525,7 +1529,7 @@ var CCITTFaxStream = (function ccittFaxStream() {
this.codingPos = codingPos;
};
- constructor.prototype.addPixelsNeg =
+ CCITTFaxStream.prototype.addPixelsNeg =
function ccittFaxStreamAddPixelsNeg(a1, blackPixels) {
var codingLine = this.codingLine;
var codingPos = this.codingPos;
@@ -1554,7 +1558,7 @@ var CCITTFaxStream = (function ccittFaxStream() {
this.codingPos = codingPos;
};
- constructor.prototype.lookChar = function ccittFaxStreamLookChar() {
+ CCITTFaxStream.prototype.lookChar = function ccittFaxStreamLookChar() {
if (this.buf != EOF)
return this.buf;
@@ -1873,7 +1877,9 @@ var CCITTFaxStream = (function ccittFaxStream() {
return [false, 0, false];
};
- constructor.prototype.getTwoDimCode = function ccittFaxStreamGetTwoDimCode() {
+ CCITTFaxStream.prototype.getTwoDimCode =
+ function ccittFaxStreamGetTwoDimCode() {
+
var code = 0;
var p;
if (this.eoblock) {
@@ -1892,7 +1898,9 @@ var CCITTFaxStream = (function ccittFaxStream() {
return EOF;
};
- constructor.prototype.getWhiteCode = function ccittFaxStreamGetWhiteCode() {
+ CCITTFaxStream.prototype.getWhiteCode =
+ function ccittFaxStreamGetWhiteCode() {
+
var code = 0;
var p;
var n;
@@ -1924,7 +1932,9 @@ var CCITTFaxStream = (function ccittFaxStream() {
return 1;
};
- constructor.prototype.getBlackCode = function ccittFaxStreamGetBlackCode() {
+ CCITTFaxStream.prototype.getBlackCode =
+ function ccittFaxStreamGetBlackCode() {
+
var code, p;
if (this.eoblock) {
code = this.lookBits(13);
@@ -1959,7 +1969,7 @@ var CCITTFaxStream = (function ccittFaxStream() {
return 1;
};
- constructor.prototype.lookBits = function ccittFaxStreamLookBits(n) {
+ CCITTFaxStream.prototype.lookBits = function ccittFaxStreamLookBits(n) {
var c;
while (this.inputBits < n) {
if ((c = this.str.getByte()) == null) {
@@ -1974,16 +1984,16 @@ var CCITTFaxStream = (function ccittFaxStream() {
return (this.inputBuf >> (this.inputBits - n)) & (0xFFFF >> (16 - n));
};
- constructor.prototype.eatBits = function ccittFaxStreamEatBits(n) {
+ CCITTFaxStream.prototype.eatBits = function ccittFaxStreamEatBits(n) {
if ((this.inputBits -= n) < 0)
this.inputBits = 0;
};
- return constructor;
+ return CCITTFaxStream;
})();
-var LZWStream = (function lzwStream() {
- function constructor(str, earlyChange) {
+var LZWStream = (function LZWStreamClosure() {
+ function LZWStream(str, earlyChange) {
this.str = str;
this.dict = str.dict;
this.cachedData = 0;
@@ -2009,9 +2019,9 @@ var LZWStream = (function lzwStream() {
DecodeStream.call(this);
}
- constructor.prototype = Object.create(DecodeStream.prototype);
+ LZWStream.prototype = Object.create(DecodeStream.prototype);
- constructor.prototype.readBits = function lzwStreamReadBits(n) {
+ LZWStream.prototype.readBits = function lzwStreamReadBits(n) {
var bitsCached = this.bitsCached;
var cachedData = this.cachedData;
while (bitsCached < n) {
@@ -2029,7 +2039,7 @@ var LZWStream = (function lzwStream() {
return (cachedData >>> bitsCached) & ((1 << n) - 1);
};
- constructor.prototype.readBlock = function lzwStreamReadBlock() {
+ LZWStream.prototype.readBlock = function lzwStreamReadBlock() {
var blockSize = 512;
var estimatedDecodedSize = blockSize * 2, decodedSizeDelta = blockSize;
var i, j, q;
@@ -2108,6 +2118,6 @@ var LZWStream = (function lzwStream() {
this.bufferLength = currentBufferLength;
};
- return constructor;
+ return LZWStream;
})();
diff --git a/src/util.js b/src/util.js
index 4fb96f062..88b9f0b45 100644
--- a/src/util.js
+++ b/src/util.js
@@ -76,24 +76,24 @@ function stringToBytes(str) {
var IDENTITY_MATRIX = [1, 0, 0, 1, 0, 0];
-var Util = (function utilUtil() {
- function constructor() {}
- constructor.makeCssRgb = function makergb(r, g, b) {
+var Util = (function UtilClosure() {
+ function Util() {}
+ Util.makeCssRgb = function makergb(r, g, b) {
var ri = (255 * r) | 0, gi = (255 * g) | 0, bi = (255 * b) | 0;
return 'rgb(' + ri + ',' + gi + ',' + bi + ')';
};
- constructor.makeCssCmyk = function makecmyk(c, m, y, k) {
+ Util.makeCssCmyk = function makecmyk(c, m, y, k) {
c = (new DeviceCmykCS()).getRgb([c, m, y, k]);
var ri = (255 * c[0]) | 0, gi = (255 * c[1]) | 0, bi = (255 * c[2]) | 0;
return 'rgb(' + ri + ',' + gi + ',' + bi + ')';
};
- constructor.applyTransform = function apply(p, m) {
+ Util.applyTransform = function apply(p, m) {
var xt = p[0] * m[0] + p[1] * m[2] + m[4];
var yt = p[0] * m[1] + p[1] * m[3] + m[5];
return [xt, yt];
};
- return constructor;
+ return Util;
})();
var PDFStringTranslateTable = [
@@ -197,7 +197,7 @@ function isPDFFunction(v) {
* can be set. If any of these happens twice or the data is required before
* it was set, an exception is throw.
*/
-var Promise = (function promise() {
+var Promise = (function PromiseClosure() {
var EMPTY_PROMISE = {};
/**
diff --git a/src/worker.js b/src/worker.js
index 8e4c14fbc..52e631c92 100644
--- a/src/worker.js
+++ b/src/worker.js
@@ -83,8 +83,8 @@ var WorkerMessageHandler = {
} catch (e) {
// Turn the error into an obj that can be serialized
e = {
- message: e.message,
- stack: e.stack
+ message: typeof e === 'object' ? e.message : e,
+ stack: typeof e === 'object' ? e.stack : null
};
handler.send('page_error', {
pageNum: pageNum,
diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
index 7a36acd58..d3caa968a 100644
--- a/test/pdfs/.gitignore
+++ b/test/pdfs/.gitignore
@@ -17,4 +17,5 @@
!devicen.pdf
!cmykjpeg.pdf
!issue840.pdf
+!scan-bad.pdf
!freeculture.pdf
diff --git a/test/pdfs/scan-bad.pdf b/test/pdfs/scan-bad.pdf
new file mode 100755
index 000000000..ca09315f9
Binary files /dev/null and b/test/pdfs/scan-bad.pdf differ
diff --git a/test/test.py b/test/test.py
index 256200587..888bd9ce8 100644
--- a/test/test.py
+++ b/test/test.py
@@ -12,6 +12,7 @@ DOC_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__),".."))
ANAL = True
DEFAULT_MANIFEST_FILE = 'test_manifest.json'
EQLOG_FILE = 'eq.log'
+BROWSERLOG_FILE = 'browser.log'
REFDIR = 'ref'
TMPDIR = 'tmp'
VERBOSE = False
@@ -229,6 +230,7 @@ class BaseBrowserCommand(object):
def setup(self):
self.tempDir = tempfile.mkdtemp()
self.profileDir = os.path.join(self.tempDir, "profile")
+ self.browserLog = open(BROWSERLOG_FILE, "w")
def teardown(self):
# If the browser is still running, wait up to ten seconds for it to quit
@@ -245,6 +247,8 @@ class BaseBrowserCommand(object):
if self.tempDir is not None and os.path.exists(self.tempDir):
shutil.rmtree(self.tempDir)
+ self.browserLog.close()
+
def start(self, url):
raise Exception("Can't start BaseBrowserCommand")
@@ -262,7 +266,7 @@ class FirefoxBrowserCommand(BaseBrowserCommand):
if platform.system() == "Darwin":
cmds.append("-foreground")
cmds.extend(["-no-remote", "-profile", self.profileDir, url])
- self.process = subprocess.Popen(cmds)
+ self.process = subprocess.Popen(cmds, stdout = self.browserLog, stderr = self.browserLog)
class ChromeBrowserCommand(BaseBrowserCommand):
def _fixupMacPath(self):
@@ -272,7 +276,7 @@ class ChromeBrowserCommand(BaseBrowserCommand):
cmds = [self.path]
cmds.extend(["--user-data-dir=%s" % self.profileDir,
"--no-first-run", "--disable-sync", url])
- self.process = subprocess.Popen(cmds)
+ self.process = subprocess.Popen(cmds, stdout = self.browserLog, stderr = self.browserLog)
def makeBrowserCommand(browser):
path = browser["path"].lower()
diff --git a/test/test_manifest.json b/test/test_manifest.json
index ab8a618c0..5cf266c63 100644
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@ -227,6 +227,12 @@
"rounds": 1,
"type": "load"
},
+ { "id": "scan-bad",
+ "file": "pdfs/scan-bad.pdf",
+ "md5": "4cf988f01ab83f61aca57f406dfd6584",
+ "rounds": 1,
+ "type": "load"
+ },
{ "id": "ibwa-bad",
"file": "pdfs/ibwa-bad.pdf",
"md5": "6ca059d32b74ac2688ae06f727fee755",
diff --git a/web/viewer.html b/web/viewer.html
index ffd4327a7..53ca2a247 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -27,9 +27,9 @@
<script type="text/javascript" src="../src/worker.js"></script> <!-- PDFJSSCRIPT_REMOVE -->
<script type="text/javascript" src="../external/jpgjs/jpg.js"></script> <!-- PDFJSSCRIPT_REMOVE -->
<script type="text/javascript">PDFJS.workerSrc = '../src/worker_loader.js';</script> <!-- PDFJSSCRIPT_REMOVE -->
-
<script type="text/javascript" src="viewer.js"></script>
- </head>
+
+ </head>
<body>
<div id="controls">
@@ -139,4 +139,3 @@
<div id="viewer"></div>
</body>
</html>
-
diff --git a/web/viewer.js b/web/viewer.js
index a3e568c7c..bdcac09d5 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -359,6 +359,7 @@ var PDFView = {
outlineScrollView.setAttribute('hidden', 'true');
thumbsSwitchButton.setAttribute('data-selected', true);
outlineSwitchButton.removeAttribute('data-selected');
+ updateThumbViewArea();
break;
case 'outline':
thumbsScrollView.setAttribute('hidden', 'true');
@@ -393,6 +394,34 @@ var PDFView = {
currentHeight += singlePage.height * singlePage.scale + kBottomMargin;
}
return visiblePages;
+ },
+
+ getVisibleThumbs: function pdfViewGetVisibleThumbs() {
+ var thumbs = this.thumbnails;
+ var kBottomMargin = 5;
+ var visibleThumbs = [];
+
+ var view = document.getElementById('sidebarScrollView');
+ var currentHeight = kBottomMargin;
+ var top = view.scrollTop;
+ for (var i = 1; i <= thumbs.length; ++i) {
+ var thumb = thumbs[i - 1];
+ var thumbHeight = thumb.height * thumb.scaleY + kBottomMargin;
+ if (currentHeight + thumbHeight > top)
+ break;
+
+ currentHeight += thumbHeight;
+ }
+
+ var bottom = top + view.clientHeight;
+ for (; i <= thumbs.length && currentHeight < bottom; ++i) {
+ var singleThumb = thumbs[i - 1];
+ visibleThumbs.push({ id: singleThumb.id, y: currentHeight,
+ view: singleThumb });
+ currentHeight += singleThumb.height * singleThumb.scaleY + kBottomMargin;
+ }
+
+ return visibleThumbs;
}
};
@@ -591,6 +620,19 @@ var ThumbnailView = function thumbnailView(container, page, id, pageRatio) {
return false;
};
+ var view = page.view;
+ this.width = view.width;
+ this.height = view.height;
+ this.id = id;
+
+ var maxThumbSize = 134;
+ var canvasWidth = pageRatio >= 1 ? maxThumbSize :
+ maxThumbSize * pageRatio;
+ var canvasHeight = pageRatio <= 1 ? maxThumbSize :
+ maxThumbSize / pageRatio;
+ var scaleX = this.scaleX = (canvasWidth / this.width);
+ var scaleY = this.scaleY = (canvasHeight / this.height);
+
var div = document.createElement('div');
div.id = 'thumbnailContainer' + id;
div.className = 'thumbnail';
@@ -605,11 +647,8 @@ var ThumbnailView = function thumbnailView(container, page, id, pageRatio) {
canvas.id = 'thumbnail' + id;
canvas.mozOpaque = true;
- var maxThumbSize = 134;
- canvas.width = pageRatio >= 1 ? maxThumbSize :
- maxThumbSize * pageRatio;
- canvas.height = pageRatio <= 1 ? maxThumbSize :
- maxThumbSize / pageRatio;
+ canvas.width = canvasWidth;
+ canvas.height = canvasHeight;
div.setAttribute('data-loaded', true);
div.appendChild(canvas);
@@ -621,8 +660,6 @@ var ThumbnailView = function thumbnailView(container, page, id, pageRatio) {
ctx.restore();
var view = page.view;
- var scaleX = (canvas.width / page.width);
- var scaleY = (canvas.height / page.height);
ctx.translate(-view.x * scaleX, -view.y * scaleY);
div.style.width = (view.width * scaleX) + 'px';
div.style.height = (view.height * scaleY) + 'px';
@@ -706,6 +743,9 @@ window.addEventListener('load', function webViewerLoad(evt) {
if ('disableWorker' in params)
PDFJS.disableWorker = params['disableWorker'] === 'true' ? true : false;
+
+ var sidebarScrollView = document.getElementById('sidebarScrollView');
+ sidebarScrollView.addEventListener('scroll', updateThumbViewArea, true);
}, true);
window.addEventListener('unload', function webViewerUnload(evt) {
@@ -744,6 +784,29 @@ window.addEventListener('scroll', function webViewerScroll(evt) {
updateViewarea();
}, true);
+
+var thumbnailTimer;
+
+function updateThumbViewArea() {
+ // Only render thumbs after pausing scrolling for this amount of time
+ // (makes UI more responsive)
+ var delay = 50; // in ms
+
+ if (thumbnailTimer)
+ clearTimeout(thumbnailTimer);
+
+ thumbnailTimer = setTimeout(function() {
+ var visibleThumbs = PDFView.getVisibleThumbs();
+ for (var i = 0; i < visibleThumbs.length; i++) {
+ var thumb = visibleThumbs[i];
+ PDFView.thumbnails[thumb.id - 1].draw();
+ }
+ }, delay);
+}
+
+window.addEventListener('transitionend', updateThumbViewArea, true);
+window.addEventListener('webkitTransitionEnd', updateThumbViewArea, true);
+
window.addEventListener('resize', function webViewerResize(evt) {
if (document.getElementById('pageWidthOption').selected ||
document.getElementById('pageFitOption').selected)
@@ -784,25 +847,6 @@ window.addEventListener('change', function webViewerChange(evt) {
document.getElementById('download').setAttribute('hidden', 'true');
}, true);
-window.addEventListener('transitionend', function webViewerTransitionend(evt) {
- var pageIndex = 0;
- var pagesCount = PDFView.pages.length;
-
- var container = document.getElementById('sidebarView');
- container._interval = window.setInterval(function interval() {
- // skipping the thumbnails with set images
- while (pageIndex < pagesCount && PDFView.thumbnails[pageIndex].hasImage)
- pageIndex++;
-
- if (pageIndex >= pagesCount) {
- window.clearInterval(container._interval);
- return;
- }
-
- PDFView.thumbnails[pageIndex++].draw();
- }, 500);
-}, true);
-
window.addEventListener('scalechange', function scalechange(evt) {
var customScaleOption = document.getElementById('customScaleOption');
customScaleOption.selected = false;