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

Ensure that Uint8ClampedArray is used for image data transfered by getTransfers (PR 9802 follow-up)

Browse Source 
One of the `QueueOptimizer` cases wasn't updated to use `Uint8ClampedArray`s, which leads to inconsistent image data on the API side (but no actual rendering bugs, as far as I can tell).
To prevent future errors, a non-production/test-only `assert` was added to ensure that the relevant image data only uses `Uint8ClampedArray`s.
This commit is contained in:
Jonas Jenwald 2018-08-16 10:07:57 +02:00
parent 1268aea2b6
commit bc89edb8f0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/operator_list.js
View File

@ -13,7 +13,7 @@
* limitations under the License. * limitations under the License.
*/ */
import { ImageKind, OPS } from '../shared/util'; import { assert, ImageKind, OPS } from '../shared/util';
var QueueOptimizer = (function QueueOptimizerClosure() { var QueueOptimizer = (function QueueOptimizerClosure() {
function addState(parentState, pattern, checkFn, iterateFn, processFn) { function addState(parentState, pattern, checkFn, iterateFn, processFn) {
@ -116,7 +116,7 @@ var QueueOptimizer = (function QueueOptimizerClosure() {
} }
var imgWidth = Math.max(maxX, currentX) + IMAGE_PADDING; var imgWidth = Math.max(maxX, currentX) + IMAGE_PADDING;
var imgHeight = currentY + maxLineHeight + IMAGE_PADDING; var imgHeight = currentY + maxLineHeight + IMAGE_PADDING;
var imgData = new Uint8Array(imgWidth * imgHeight * 4); var imgData = new Uint8ClampedArray(imgWidth * imgHeight * 4);
var imgRowSize = imgWidth << 2; var imgRowSize = imgWidth << 2;
for (q = 0; q < count; q++) { for (q = 0; q < count; q++) {
var data = argsArray[iFirstPIIXO + (q << 2)][0].data; var data = argsArray[iFirstPIIXO + (q << 2)][0].data;
@ -543,6 +543,12 @@ var OperatorList = (function OperatorListClosure() {
case OPS.paintInlineImageXObjectGroup: case OPS.paintInlineImageXObjectGroup:
case OPS.paintImageMaskXObject: case OPS.paintImageMaskXObject:
var arg = argsArray[i][0]; // first param in imgData var arg = argsArray[i][0]; // first param in imgData
if (typeof PDFJSDev === 'undefined' ||
PDFJSDev.test('!PRODUCTION || TESTING')) {
assert(arg.data instanceof Uint8ClampedArray,
'OperatorList - getTransfers: Unsupported "arg.data" type.');
}
if (!arg.cached) { if (!arg.cached) {
transfers.push(arg.data.buffer); transfers.push(arg.data.buffer);
} }