From 28a686725d21a42d13bc0972e9f5e6b0c8b0d104 Mon Sep 17 00:00:00 2001 From: Yury Delendik Date: Mon, 22 Sep 2014 16:22:46 -0500 Subject: [PATCH] PDF.js version 1.0.182 --- bower.json | 2 +- build/pdf.combined.js | 44 ++++++++++++++++++++++++------------------- build/pdf.js | 44 ++++++++++++++++++++++++------------------- build/pdf.worker.js | 44 ++++++++++++++++++++++++------------------- package.json | 2 +- 5 files changed, 77 insertions(+), 59 deletions(-) diff --git a/bower.json b/bower.json index 1ffee7854..22e9720ad 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.0.179", + "version": "1.0.182", "keywords": [ "Mozilla", "pdf", diff --git a/build/pdf.combined.js b/build/pdf.combined.js index 240a5e00c..150c04316 100644 --- a/build/pdf.combined.js +++ b/build/pdf.combined.js @@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') { (typeof window !== 'undefined' ? window : this).PDFJS = {}; } -PDFJS.version = '1.0.179'; -PDFJS.build = '2acb40f'; +PDFJS.version = '1.0.182'; +PDFJS.build = 'a27f51e'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -3241,24 +3241,30 @@ var Annotation = (function AnnotationClosure() { // TODO: implement proper support for annotations with line dash patterns. var dashArray = borderArray[3]; - if (data.borderWidth > 0 && dashArray && isArray(dashArray)) { - var dashArrayLength = dashArray.length; - if (dashArrayLength > 0) { - // According to the PDF specification: the elements in a dashArray - // shall be numbers that are nonnegative and not all equal to zero. - var isInvalid = false; - var numPositive = 0; - for (var i = 0; i < dashArrayLength; i++) { - var validNumber = (+dashArray[i] >= 0); - if (!validNumber) { - isInvalid = true; - break; - } else if (dashArray[i] > 0) { - numPositive++; + if (data.borderWidth > 0 && dashArray) { + if (!isArray(dashArray)) { + // Ignore the border if dashArray is not actually an array, + // this is consistent with the behaviour in Adobe Reader. + data.borderWidth = 0; + } else { + var dashArrayLength = dashArray.length; + if (dashArrayLength > 0) { + // According to the PDF specification: the elements in a dashArray + // shall be numbers that are nonnegative and not all equal to zero. + var isInvalid = false; + var numPositive = 0; + for (var i = 0; i < dashArrayLength; i++) { + var validNumber = (+dashArray[i] >= 0); + if (!validNumber) { + isInvalid = true; + break; + } else if (dashArray[i] > 0) { + numPositive++; + } + } + if (isInvalid || numPositive === 0) { + data.borderWidth = 0; } - } - if (isInvalid || numPositive === 0) { - data.borderWidth = 0; } } } diff --git a/build/pdf.js b/build/pdf.js index 7c82ca843..852ae89d3 100644 --- a/build/pdf.js +++ b/build/pdf.js @@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') { (typeof window !== 'undefined' ? window : this).PDFJS = {}; } -PDFJS.version = '1.0.179'; -PDFJS.build = '2acb40f'; +PDFJS.version = '1.0.182'; +PDFJS.build = 'a27f51e'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -3241,24 +3241,30 @@ var Annotation = (function AnnotationClosure() { // TODO: implement proper support for annotations with line dash patterns. var dashArray = borderArray[3]; - if (data.borderWidth > 0 && dashArray && isArray(dashArray)) { - var dashArrayLength = dashArray.length; - if (dashArrayLength > 0) { - // According to the PDF specification: the elements in a dashArray - // shall be numbers that are nonnegative and not all equal to zero. - var isInvalid = false; - var numPositive = 0; - for (var i = 0; i < dashArrayLength; i++) { - var validNumber = (+dashArray[i] >= 0); - if (!validNumber) { - isInvalid = true; - break; - } else if (dashArray[i] > 0) { - numPositive++; + if (data.borderWidth > 0 && dashArray) { + if (!isArray(dashArray)) { + // Ignore the border if dashArray is not actually an array, + // this is consistent with the behaviour in Adobe Reader. + data.borderWidth = 0; + } else { + var dashArrayLength = dashArray.length; + if (dashArrayLength > 0) { + // According to the PDF specification: the elements in a dashArray + // shall be numbers that are nonnegative and not all equal to zero. + var isInvalid = false; + var numPositive = 0; + for (var i = 0; i < dashArrayLength; i++) { + var validNumber = (+dashArray[i] >= 0); + if (!validNumber) { + isInvalid = true; + break; + } else if (dashArray[i] > 0) { + numPositive++; + } + } + if (isInvalid || numPositive === 0) { + data.borderWidth = 0; } - } - if (isInvalid || numPositive === 0) { - data.borderWidth = 0; } } } diff --git a/build/pdf.worker.js b/build/pdf.worker.js index 3de9a2811..a73e21ac5 100644 --- a/build/pdf.worker.js +++ b/build/pdf.worker.js @@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') { (typeof window !== 'undefined' ? window : this).PDFJS = {}; } -PDFJS.version = '1.0.179'; -PDFJS.build = '2acb40f'; +PDFJS.version = '1.0.182'; +PDFJS.build = 'a27f51e'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it @@ -3241,24 +3241,30 @@ var Annotation = (function AnnotationClosure() { // TODO: implement proper support for annotations with line dash patterns. var dashArray = borderArray[3]; - if (data.borderWidth > 0 && dashArray && isArray(dashArray)) { - var dashArrayLength = dashArray.length; - if (dashArrayLength > 0) { - // According to the PDF specification: the elements in a dashArray - // shall be numbers that are nonnegative and not all equal to zero. - var isInvalid = false; - var numPositive = 0; - for (var i = 0; i < dashArrayLength; i++) { - var validNumber = (+dashArray[i] >= 0); - if (!validNumber) { - isInvalid = true; - break; - } else if (dashArray[i] > 0) { - numPositive++; + if (data.borderWidth > 0 && dashArray) { + if (!isArray(dashArray)) { + // Ignore the border if dashArray is not actually an array, + // this is consistent with the behaviour in Adobe Reader. + data.borderWidth = 0; + } else { + var dashArrayLength = dashArray.length; + if (dashArrayLength > 0) { + // According to the PDF specification: the elements in a dashArray + // shall be numbers that are nonnegative and not all equal to zero. + var isInvalid = false; + var numPositive = 0; + for (var i = 0; i < dashArrayLength; i++) { + var validNumber = (+dashArray[i] >= 0); + if (!validNumber) { + isInvalid = true; + break; + } else if (dashArray[i] > 0) { + numPositive++; + } + } + if (isInvalid || numPositive === 0) { + data.borderWidth = 0; } - } - if (isInvalid || numPositive === 0) { - data.borderWidth = 0; } } } diff --git a/package.json b/package.json index 303bfbfb2..1a1fbccf1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.0.179", + "version": "1.0.182", "description": "Generic build of Mozilla's PDF.js library.", "keywords": [ "Mozilla",