Merge remote-tracking branch 'upstream/master' into refactor

This commit is contained in:
Kalervo Kujala 2012-01-07 21:32:16 +02:00
commit d89680bd94
4 changed files with 56 additions and 28 deletions

View file

@ -211,7 +211,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
args = [objId, w, h];
var softMask = dict.get('SMask', 'IM') || false;
if (!softMask && image instanceof JpegStream && image.isNative) {
if (!softMask && image instanceof JpegStream &&
image.isNativelySupported(xref, resources)) {
// These JPEGs don't need any more processing so we can just send it.
fn = 'paintJpegXObject';
handler.send('obj', [objId, 'JpegStream', image.getIR()]);