From 85a895c5c6bb4192be189fd0257c2585f2f8706f Mon Sep 17 00:00:00 2001 From: Pdf Bot Date: Wed, 28 Oct 2015 21:53:50 +0000 Subject: [PATCH] PDF.js version 1.2.36 - See mozilla/pdf.js@d26ef21d52777ffb7c617451e63a52377cd3e153 --- bower.json | 2 +- build/pdf.combined.js | 19 ++++++++++++------- build/pdf.js | 11 +++++++++-- build/pdf.worker.js | 12 +++++------- package.json | 2 +- 5 files changed, 28 insertions(+), 18 deletions(-) diff --git a/bower.json b/bower.json index 92da0d199..adabff083 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.2.34", + "version": "1.2.36", "main": [ "build/pdf.js", "build/pdf.worker.js" diff --git a/build/pdf.combined.js b/build/pdf.combined.js index 8801638bd..f2dedbf54 100644 --- a/build/pdf.combined.js +++ b/build/pdf.combined.js @@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') { (typeof window !== 'undefined' ? window : this).PDFJS = {}; } -PDFJS.version = '1.2.34'; -PDFJS.build = '7a3963e'; +PDFJS.version = '1.2.36'; +PDFJS.build = 'd26ef21'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -1638,6 +1638,8 @@ function loadJpegStream(id, imageUrl, objs) { } +var DEFAULT_RANGE_CHUNK_SIZE = 65536; // 2^16 = 65536 + /** * The maximum allowed image size in total pixels e.g. width * height. Images * above this value will not be drawn. Use -1 for no limit. @@ -1832,6 +1834,9 @@ PDFJS.isEvalSupported = (PDFJS.isEvalSupported === undefined ? * @property {number} length - The PDF file length. It's used for progress * reports and range requests operations. * @property {PDFDataRangeTransport} range + * @property {number} rangeChunkSize - Optional parameter to specify + * maximum number of bytes fetched per range request. The default value is + * 2^16 = 65536. */ /** @@ -1941,6 +1946,8 @@ PDFJS.getDocument = function getDocument(src, params[key] = source[key]; } + params.rangeChunkSize = source.rangeChunkSize || DEFAULT_RANGE_CHUNK_SIZE; + workerInitializedCapability = createPromiseCapability(); transport = new WorkerTransport(workerInitializedCapability, source.range); workerInitializedCapability.promise.then(function transportInitialized() { @@ -8983,9 +8990,6 @@ var ChunkedStreamManager = (function ChunkedStreamManagerClosure() { })(); -// The maximum number of bytes fetched per range request -var RANGE_CHUNK_SIZE = 65536; - // TODO(mack): Make use of PDFJS.Util.inherit() when it becomes available var BasePdfManager = (function BasePdfManagerClosure() { function BasePdfManager() { @@ -9117,7 +9121,8 @@ var NetworkPdfManager = (function NetworkPdfManagerClosure() { disableAutoFetch: args.disableAutoFetch, initialData: args.initialData }; - this.streamManager = new ChunkedStreamManager(args.length, RANGE_CHUNK_SIZE, + this.streamManager = new ChunkedStreamManager(args.length, + args.rangeChunkSize, args.url, params); this.pdfDocument = new PDFDocument(this, this.streamManager.getStream(), @@ -40947,7 +40952,7 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = { return; } source.length = length; - if (length <= 2 * RANGE_CHUNK_SIZE) { + if (length <= 2 * source.rangeChunkSize) { // The file size is smaller than the size of two chunks, so it does // not make any sense to abort the request and retry with a range // request. diff --git a/build/pdf.js b/build/pdf.js index 9c10f3818..1bd059006 100644 --- a/build/pdf.js +++ b/build/pdf.js @@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') { (typeof window !== 'undefined' ? window : this).PDFJS = {}; } -PDFJS.version = '1.2.34'; -PDFJS.build = '7a3963e'; +PDFJS.version = '1.2.36'; +PDFJS.build = 'd26ef21'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -1647,6 +1647,8 @@ function loadJpegStream(id, imageUrl, objs) { } +var DEFAULT_RANGE_CHUNK_SIZE = 65536; // 2^16 = 65536 + /** * The maximum allowed image size in total pixels e.g. width * height. Images * above this value will not be drawn. Use -1 for no limit. @@ -1841,6 +1843,9 @@ PDFJS.isEvalSupported = (PDFJS.isEvalSupported === undefined ? * @property {number} length - The PDF file length. It's used for progress * reports and range requests operations. * @property {PDFDataRangeTransport} range + * @property {number} rangeChunkSize - Optional parameter to specify + * maximum number of bytes fetched per range request. The default value is + * 2^16 = 65536. */ /** @@ -1950,6 +1955,8 @@ PDFJS.getDocument = function getDocument(src, params[key] = source[key]; } + params.rangeChunkSize = source.rangeChunkSize || DEFAULT_RANGE_CHUNK_SIZE; + workerInitializedCapability = createPromiseCapability(); transport = new WorkerTransport(workerInitializedCapability, source.range); workerInitializedCapability.promise.then(function transportInitialized() { diff --git a/build/pdf.worker.js b/build/pdf.worker.js index 200ac83bf..fb94ade7b 100644 --- a/build/pdf.worker.js +++ b/build/pdf.worker.js @@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') { (typeof window !== 'undefined' ? window : this).PDFJS = {}; } -PDFJS.version = '1.2.34'; -PDFJS.build = '7a3963e'; +PDFJS.version = '1.2.36'; +PDFJS.build = 'd26ef21'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -2425,9 +2425,6 @@ var ChunkedStreamManager = (function ChunkedStreamManagerClosure() { })(); -// The maximum number of bytes fetched per range request -var RANGE_CHUNK_SIZE = 65536; - // TODO(mack): Make use of PDFJS.Util.inherit() when it becomes available var BasePdfManager = (function BasePdfManagerClosure() { function BasePdfManager() { @@ -2559,7 +2556,8 @@ var NetworkPdfManager = (function NetworkPdfManagerClosure() { disableAutoFetch: args.disableAutoFetch, initialData: args.initialData }; - this.streamManager = new ChunkedStreamManager(args.length, RANGE_CHUNK_SIZE, + this.streamManager = new ChunkedStreamManager(args.length, + args.rangeChunkSize, args.url, params); this.pdfDocument = new PDFDocument(this, this.streamManager.getStream(), @@ -34389,7 +34387,7 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = { return; } source.length = length; - if (length <= 2 * RANGE_CHUNK_SIZE) { + if (length <= 2 * source.rangeChunkSize) { // The file size is smaller than the size of two chunks, so it does // not make any sense to abort the request and retry with a range // request. diff --git a/package.json b/package.json index 195e9c105..6d236f092 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.2.34", + "version": "1.2.36", "description": "Generic build of Mozilla's PDF.js library.", "keywords": [ "Mozilla",