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

Check if the Decode entry is non-default when deciding if JPEG images are natively supported/decodable (issue 6238)

Browse Source 
Tentatively fixes 6238.
This commit is contained in:
Jonas Jenwald 2015-07-20 23:30:05 +02:00
parent 862342189f
commit 385e2e5aaf
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/colorspace.js
View File

@ -351,7 +351,7 @@ var ColorSpace = (function ColorSpaceClosure() {
* @param {Number} n Number of components the color space has. * @param {Number} n Number of components the color space has.
*/ */
ColorSpace.isDefaultDecode = function ColorSpace_isDefaultDecode(decode, n) { ColorSpace.isDefaultDecode = function ColorSpace_isDefaultDecode(decode, n) {
if (!decode) { if (!isArray(decode)) {
return true; return true;
} }

7
src/core/stream.js
View File

@ -942,7 +942,8 @@ var JpegStream = (function JpegStreamClosure() {
JpegStream.prototype.isNativelySupported = JpegStream.prototype.isNativelySupported =
function JpegStream_isNativelySupported(xref, res) { function JpegStream_isNativelySupported(xref, res) {
var cs = ColorSpace.parse(this.dict.get('ColorSpace', 'CS'), xref, res); var cs = ColorSpace.parse(this.dict.get('ColorSpace', 'CS'), xref, res);
return cs.name === 'DeviceGray' || cs.name === 'DeviceRGB'; return (cs.name === 'DeviceGray' || cs.name === 'DeviceRGB') &&
cs.isDefaultDecode(this.dict.get('Decode', 'D'));
}; };
/** /**
* Checks if the image can be decoded by the browser. * Checks if the image can be decoded by the browser.
@ -950,8 +951,8 @@ var JpegStream = (function JpegStreamClosure() {
JpegStream.prototype.isNativelyDecodable = JpegStream.prototype.isNativelyDecodable =
function JpegStream_isNativelyDecodable(xref, res) { function JpegStream_isNativelyDecodable(xref, res) {
var cs = ColorSpace.parse(this.dict.get('ColorSpace', 'CS'), xref, res); var cs = ColorSpace.parse(this.dict.get('ColorSpace', 'CS'), xref, res);
var numComps = cs.numComps; return (cs.numComps === 1 || cs.numComps === 3) &&
return numComps === 1 || numComps === 3; cs.isDefaultDecode(this.dict.get('Decode', 'D'));
}; };
return JpegStream; return JpegStream;

1
test/pdfs/issue6238.pdf.link Normal file
View File

@ -0,0 +1 @@
http://web.archive.org/web/20150720164240/http://fqa.9front.org/dash1.kaptnblaubar.pdf

9
test/test_manifest.json
View File

@ -1338,6 +1338,15 @@
"lastPage": 6, "lastPage": 6,
"type": "eq" "type": "eq"
}, },
{ "id": "issue6238",
"file": "pdfs/issue6238.pdf",
"md5": "6d7731ee22fbbdf746c8da01b8922d50",
"rounds": 1,
"link": true,
"firstPage": 3,
"lastPage": 3,
"type": "eq"
},
{ "id": "cid_cff", { "id": "cid_cff",
"file": "pdfs/cid_cff.pdf", "file": "pdfs/cid_cff.pdf",
"md5": "a19a18eaa626262cc45e0760004d6de9", "md5": "a19a18eaa626262cc45e0760004d6de9",