From 63f73862593bb237d4bf998564214d9e811f9f38 Mon Sep 17 00:00:00 2001 From: Pdf Bot Date: Thu, 11 Feb 2016 13:24:34 +0000 Subject: [PATCH] PDF.js version 1.4.61 - See mozilla/pdf.js@1f49e7b19490e5f2c3a82eadee1cf240b2597ca2 --- bower.json | 2 +- build/pdf.combined.js | 50 ++++++++++++++++++++++++++----------------- build/pdf.js | 4 ++-- build/pdf.worker.js | 50 ++++++++++++++++++++++++++----------------- package.json | 2 +- 5 files changed, 64 insertions(+), 44 deletions(-) diff --git a/bower.json b/bower.json index 1351ae96e..fa210bb6b 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.4.59", + "version": "1.4.61", "main": [ "build/pdf.js", "build/pdf.worker.js" diff --git a/build/pdf.combined.js b/build/pdf.combined.js index 90d64e04b..cb8e988fd 100644 --- a/build/pdf.combined.js +++ b/build/pdf.combined.js @@ -28,8 +28,8 @@ factory((root.pdfjsDistBuildPdfCombined = {})); // Use strict in our context only - users might not want it 'use strict'; -var pdfjsVersion = '1.4.59'; -var pdfjsBuild = '6133a99'; +var pdfjsVersion = '1.4.61'; +var pdfjsBuild = '1f49e7b'; var pdfjsFilePath = typeof document !== 'undefined' && document.currentScript ? @@ -42311,15 +42311,15 @@ var ColorSpace = (function ColorSpaceClosure() { case 'DeviceCmykCS': return this.singletons.cmyk; case 'CalGrayCS': - whitePoint = IR[1].WhitePoint; - blackPoint = IR[1].BlackPoint; - gamma = IR[1].Gamma; + whitePoint = IR[1]; + blackPoint = IR[2]; + gamma = IR[3]; return new CalGrayCS(whitePoint, blackPoint, gamma); case 'CalRGBCS': - whitePoint = IR[1].WhitePoint; - blackPoint = IR[1].BlackPoint; - gamma = IR[1].Gamma; - var matrix = IR[1].Matrix; + whitePoint = IR[1]; + blackPoint = IR[2]; + gamma = IR[3]; + var matrix = IR[4]; return new CalRGBCS(whitePoint, blackPoint, gamma, matrix); case 'PatternCS': var basePatternCS = IR[1]; @@ -42338,11 +42338,11 @@ var ColorSpace = (function ColorSpaceClosure() { var tintFnIR = IR[3]; return new AlternateCS(numComps, ColorSpace.fromIR(alt), - PDFFunction.fromIR(tintFnIR)); + PDFFunction.fromIR(tintFnIR)); case 'LabCS': - whitePoint = IR[1].WhitePoint; - blackPoint = IR[1].BlackPoint; - var range = IR[1].Range; + whitePoint = IR[1]; + blackPoint = IR[2]; + var range = IR[3]; return new LabCS(whitePoint, blackPoint, range); default: error('Unknown name ' + name); @@ -42386,7 +42386,7 @@ var ColorSpace = (function ColorSpaceClosure() { } else if (isArray(cs)) { mode = xref.fetchIfRef(cs[0]).name; this.mode = mode; - var numComps, params, alt; + var numComps, params, alt, whitePoint, blackPoint, gamma; switch (mode) { case 'DeviceGray': @@ -42399,11 +42399,18 @@ var ColorSpace = (function ColorSpaceClosure() { case 'CMYK': return 'DeviceCmykCS'; case 'CalGray': - params = xref.fetchIfRef(cs[1]).getAll(); - return ['CalGrayCS', params]; + params = xref.fetchIfRef(cs[1]); + whitePoint = params.get('WhitePoint'); + blackPoint = params.get('BlackPoint'); + gamma = params.get('Gamma'); + return ['CalGrayCS', whitePoint, blackPoint, gamma]; case 'CalRGB': - params = xref.fetchIfRef(cs[1]).getAll(); - return ['CalRGBCS', params]; + params = xref.fetchIfRef(cs[1]); + whitePoint = params.get('WhitePoint'); + blackPoint = params.get('BlackPoint'); + gamma = params.get('Gamma'); + var matrix = params.get('Matrix'); + return ['CalRGBCS', whitePoint, blackPoint, gamma, matrix]; case 'ICCBased': var stream = xref.fetchIfRef(cs[1]); var dict = stream.dict; @@ -42455,8 +42462,11 @@ var ColorSpace = (function ColorSpaceClosure() { var tintFnIR = PDFFunction.getIR(xref, xref.fetchIfRef(cs[3])); return ['AlternateCS', numComps, alt, tintFnIR]; case 'Lab': - params = xref.fetchIfRef(cs[1]).getAll(); - return ['LabCS', params]; + params = xref.fetchIfRef(cs[1]); + whitePoint = params.get('WhitePoint'); + blackPoint = params.get('BlackPoint'); + var range = params.get('Range'); + return ['LabCS', whitePoint, blackPoint, range]; default: error('unimplemented color space object "' + mode + '"'); } diff --git a/build/pdf.js b/build/pdf.js index 8535934d4..08d7a94f3 100644 --- a/build/pdf.js +++ b/build/pdf.js @@ -28,8 +28,8 @@ factory((root.pdfjsDistBuildPdf = {})); // Use strict in our context only - users might not want it 'use strict'; -var pdfjsVersion = '1.4.59'; -var pdfjsBuild = '6133a99'; +var pdfjsVersion = '1.4.61'; +var pdfjsBuild = '1f49e7b'; var pdfjsFilePath = typeof document !== 'undefined' && document.currentScript ? diff --git a/build/pdf.worker.js b/build/pdf.worker.js index 1fd169d98..ea23a172a 100644 --- a/build/pdf.worker.js +++ b/build/pdf.worker.js @@ -28,8 +28,8 @@ factory((root.pdfjsDistBuildPdfWorker = {})); // Use strict in our context only - users might not want it 'use strict'; -var pdfjsVersion = '1.4.59'; -var pdfjsBuild = '6133a99'; +var pdfjsVersion = '1.4.61'; +var pdfjsBuild = '1f49e7b'; var pdfjsFilePath = typeof document !== 'undefined' && document.currentScript ? @@ -34460,15 +34460,15 @@ var ColorSpace = (function ColorSpaceClosure() { case 'DeviceCmykCS': return this.singletons.cmyk; case 'CalGrayCS': - whitePoint = IR[1].WhitePoint; - blackPoint = IR[1].BlackPoint; - gamma = IR[1].Gamma; + whitePoint = IR[1]; + blackPoint = IR[2]; + gamma = IR[3]; return new CalGrayCS(whitePoint, blackPoint, gamma); case 'CalRGBCS': - whitePoint = IR[1].WhitePoint; - blackPoint = IR[1].BlackPoint; - gamma = IR[1].Gamma; - var matrix = IR[1].Matrix; + whitePoint = IR[1]; + blackPoint = IR[2]; + gamma = IR[3]; + var matrix = IR[4]; return new CalRGBCS(whitePoint, blackPoint, gamma, matrix); case 'PatternCS': var basePatternCS = IR[1]; @@ -34487,11 +34487,11 @@ var ColorSpace = (function ColorSpaceClosure() { var tintFnIR = IR[3]; return new AlternateCS(numComps, ColorSpace.fromIR(alt), - PDFFunction.fromIR(tintFnIR)); + PDFFunction.fromIR(tintFnIR)); case 'LabCS': - whitePoint = IR[1].WhitePoint; - blackPoint = IR[1].BlackPoint; - var range = IR[1].Range; + whitePoint = IR[1]; + blackPoint = IR[2]; + var range = IR[3]; return new LabCS(whitePoint, blackPoint, range); default: error('Unknown name ' + name); @@ -34535,7 +34535,7 @@ var ColorSpace = (function ColorSpaceClosure() { } else if (isArray(cs)) { mode = xref.fetchIfRef(cs[0]).name; this.mode = mode; - var numComps, params, alt; + var numComps, params, alt, whitePoint, blackPoint, gamma; switch (mode) { case 'DeviceGray': @@ -34548,11 +34548,18 @@ var ColorSpace = (function ColorSpaceClosure() { case 'CMYK': return 'DeviceCmykCS'; case 'CalGray': - params = xref.fetchIfRef(cs[1]).getAll(); - return ['CalGrayCS', params]; + params = xref.fetchIfRef(cs[1]); + whitePoint = params.get('WhitePoint'); + blackPoint = params.get('BlackPoint'); + gamma = params.get('Gamma'); + return ['CalGrayCS', whitePoint, blackPoint, gamma]; case 'CalRGB': - params = xref.fetchIfRef(cs[1]).getAll(); - return ['CalRGBCS', params]; + params = xref.fetchIfRef(cs[1]); + whitePoint = params.get('WhitePoint'); + blackPoint = params.get('BlackPoint'); + gamma = params.get('Gamma'); + var matrix = params.get('Matrix'); + return ['CalRGBCS', whitePoint, blackPoint, gamma, matrix]; case 'ICCBased': var stream = xref.fetchIfRef(cs[1]); var dict = stream.dict; @@ -34604,8 +34611,11 @@ var ColorSpace = (function ColorSpaceClosure() { var tintFnIR = PDFFunction.getIR(xref, xref.fetchIfRef(cs[3])); return ['AlternateCS', numComps, alt, tintFnIR]; case 'Lab': - params = xref.fetchIfRef(cs[1]).getAll(); - return ['LabCS', params]; + params = xref.fetchIfRef(cs[1]); + whitePoint = params.get('WhitePoint'); + blackPoint = params.get('BlackPoint'); + var range = params.get('Range'); + return ['LabCS', whitePoint, blackPoint, range]; default: error('unimplemented color space object "' + mode + '"'); } diff --git a/package.json b/package.json index 5d2412137..7de1d0110 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.4.59", + "version": "1.4.61", "main": "build/pdf.js", "description": "Generic build of Mozilla's PDF.js library.", "keywords": [