From 37124a708be3bc7366971dfcdbe486e919d78f17 Mon Sep 17 00:00:00 2001 From: Pdf Bot Date: Wed, 17 Dec 2014 21:24:38 +0000 Subject: [PATCH] PDF.js version 1.0.995 --- bower.json | 2 +- build/pdf.combined.js | 34 ++++++++++++++++++++++++++-------- build/pdf.js | 4 ++-- build/pdf.worker.js | 34 ++++++++++++++++++++++++++-------- package.json | 2 +- 5 files changed, 56 insertions(+), 20 deletions(-) diff --git a/bower.json b/bower.json index 0b4dee090..943fa66f4 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.0.993", + "version": "1.0.995", "main": [ "build/pdf.js", "build/pdf.worker.js" diff --git a/build/pdf.combined.js b/build/pdf.combined.js index 4f2ef2c26..1ed676bae 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.0.993'; -PDFJS.build = '01cf219'; +PDFJS.version = '1.0.995'; +PDFJS.build = 'ee70aad'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -41540,12 +41540,6 @@ var JpxImage = (function JpxImageClosure() { cod.precinctsSizes = precinctsSizes; } var unsupported = []; - if (cod.sopMarkerUsed) { - unsupported.push('sopMarkerUsed'); - } - if (cod.ephMarkerUsed) { - unsupported.push('ephMarkerUsed'); - } if (cod.selectiveArithmeticCodingBypass) { unsupported.push('selectiveArithmeticCodingBypass'); } @@ -42032,6 +42026,21 @@ var JpxImage = (function JpxImageClosure() { bufferSize -= count; return (buffer >>> bufferSize) & ((1 << count) - 1); } + function skipMarkerIfEqual(value) { + if (data[offset + position - 1] === 0xFF && + data[offset + position] === value) { + skipBytes(1); + return true; + } else if (data[offset + position] === 0xFF && + data[offset + position + 1] === value) { + skipBytes(2); + return true; + } + return false; + } + function skipBytes(count) { + position += count; + } function alignToByte() { bufferSize = 0; if (skipNextBit) { @@ -42059,9 +42068,15 @@ var JpxImage = (function JpxImageClosure() { } var tileIndex = context.currentTile.index; var tile = context.tiles[tileIndex]; + var sopMarkerUsed = context.COD.sopMarkerUsed; + var ephMarkerUsed = context.COD.ephMarkerUsed; var packetsIterator = tile.packetsIterator; while (position < dataLength) { alignToByte(); + if (sopMarkerUsed && skipMarkerIfEqual(0x91)) { + // Skip also marker segment length and packet sequence ID + skipBytes(4); + } if (!readBits(1)) { continue; } @@ -42144,6 +42159,9 @@ var JpxImage = (function JpxImageClosure() { }); } alignToByte(); + if (ephMarkerUsed) { + skipMarkerIfEqual(0x92); + } while (queue.length > 0) { var packetItem = queue.shift(); codeblock = packetItem.codeblock; diff --git a/build/pdf.js b/build/pdf.js index cf5914aad..cfa33a8e9 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.0.993'; -PDFJS.build = '01cf219'; +PDFJS.version = '1.0.995'; +PDFJS.build = 'ee70aad'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it diff --git a/build/pdf.worker.js b/build/pdf.worker.js index 60511d24c..a24ea4e24 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.0.993'; -PDFJS.build = '01cf219'; +PDFJS.version = '1.0.995'; +PDFJS.build = 'ee70aad'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -35413,12 +35413,6 @@ var JpxImage = (function JpxImageClosure() { cod.precinctsSizes = precinctsSizes; } var unsupported = []; - if (cod.sopMarkerUsed) { - unsupported.push('sopMarkerUsed'); - } - if (cod.ephMarkerUsed) { - unsupported.push('ephMarkerUsed'); - } if (cod.selectiveArithmeticCodingBypass) { unsupported.push('selectiveArithmeticCodingBypass'); } @@ -35905,6 +35899,21 @@ var JpxImage = (function JpxImageClosure() { bufferSize -= count; return (buffer >>> bufferSize) & ((1 << count) - 1); } + function skipMarkerIfEqual(value) { + if (data[offset + position - 1] === 0xFF && + data[offset + position] === value) { + skipBytes(1); + return true; + } else if (data[offset + position] === 0xFF && + data[offset + position + 1] === value) { + skipBytes(2); + return true; + } + return false; + } + function skipBytes(count) { + position += count; + } function alignToByte() { bufferSize = 0; if (skipNextBit) { @@ -35932,9 +35941,15 @@ var JpxImage = (function JpxImageClosure() { } var tileIndex = context.currentTile.index; var tile = context.tiles[tileIndex]; + var sopMarkerUsed = context.COD.sopMarkerUsed; + var ephMarkerUsed = context.COD.ephMarkerUsed; var packetsIterator = tile.packetsIterator; while (position < dataLength) { alignToByte(); + if (sopMarkerUsed && skipMarkerIfEqual(0x91)) { + // Skip also marker segment length and packet sequence ID + skipBytes(4); + } if (!readBits(1)) { continue; } @@ -36017,6 +36032,9 @@ var JpxImage = (function JpxImageClosure() { }); } alignToByte(); + if (ephMarkerUsed) { + skipMarkerIfEqual(0x92); + } while (queue.length > 0) { var packetItem = queue.shift(); codeblock = packetItem.codeblock; diff --git a/package.json b/package.json index 9b9b047c6..bdaf0ad69 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.0.993", + "version": "1.0.995", "description": "Generic build of Mozilla's PDF.js library.", "keywords": [ "Mozilla",