Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10063 from Snuffleupagus/JPEG-isSourcePDF-assert

Browse Source 
Slightly improve the `isSourcePDF` parameter handling in `JpegImage` (PR 10031 follow-up)
This commit is contained in:
Tim van der Meij 2018-09-12 14:56:42 +02:00 committed by GitHub
commit 29683d40a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/jpg.js
View File

@ -14,7 +14,7 @@
*/ */
/* eslint-disable no-multi-spaces */ /* eslint-disable no-multi-spaces */
import { warn } from '../shared/util'; import { assert, warn } from '../shared/util';
let JpegError = (function JpegErrorClosure() { let JpegError = (function JpegErrorClosure() {
function JpegError(msg) { function JpegError(msg) {
@ -1026,7 +1026,7 @@ var JpegImage = (function JpegImageClosure() {
// out-of-box behaviour when `JpegImage` is used standalone, default to // out-of-box behaviour when `JpegImage` is used standalone, default to
// inverting JPEG (CMYK) images if and only if the image data does *not* // inverting JPEG (CMYK) images if and only if the image data does *not*
// come from a PDF file and no `decodeTransform` was passed by the user. // come from a PDF file and no `decodeTransform` was passed by the user.
if (!transform && numComponents === 4 && !isSourcePDF) { if (!isSourcePDF && numComponents === 4 && !transform) {
transform = new Int32Array([ transform = new Int32Array([
-256, 255, -256, 255, -256, 255, -256, 255]); -256, 255, -256, 255, -256, 255, -256, 255]);
} }
@ -1180,6 +1180,10 @@ var JpegImage = (function JpegImageClosure() {
}, },
getData({ width, height, forceRGB = false, isSourcePDF = false, }) { getData({ width, height, forceRGB = false, isSourcePDF = false, }) {
if (typeof PDFJSDev !== 'undefined' && PDFJSDev.test('TESTING && !LIB')) {
assert(isSourcePDF === true,
'JpegImage.getData: Unexpected "isSourcePDF" value for PDF files.');
}
if (this.numComponents > 4) { if (this.numComponents > 4) {
throw new JpegError('Unsupported color mode'); throw new JpegError('Unsupported color mode');
} }