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

Slightly improve the isSourcePDF parameter handling in JpegImage (PR 10031 follow-up)

Browse Source 
Currently there's only a single spot in the code-base where `JpegImage.getData` is called, however it nonetheless seem like a good idea to ensure during tests that the `isSourcePDF` parameter is correctly set. (Especially considering that the PDF use-cases will break without it.)

Additionally, in `JpegImage._getLinearizedBlockData`, the code can be made a tiny bit more efficient by checking the value of `isSourcePDF` *first* to avoid useless checks (for the default PDF use-cases).
This commit is contained in:
Jonas Jenwald 2018-09-12 11:30:59 +02:00
parent 9c764da8af
commit 5181172498
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 */
import { warn } from '../shared/util';
import { assert, warn } from '../shared/util';
let JpegError = (function JpegErrorClosure() {
function JpegError(msg) {
@ -1026,7 +1026,7 @@ var JpegImage = (function JpegImageClosure() {
// out-of-box behaviour when `JpegImage` is used standalone, default to
// 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.
if (!transform && numComponents === 4 && !isSourcePDF) {
if (!isSourcePDF && numComponents === 4 && !transform) {
transform = new Int32Array([
-256, 255, -256, 255, -256, 255, -256, 255]);
}
@ -1180,6 +1180,10 @@ var JpegImage = (function JpegImageClosure() {
},
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) {
throw new JpegError('Unsupported color mode');
}