Merge pull request #6062 from Snuffleupagus/revert-parse-all-jpegs
Revert PR 6024 "[Firefox] Parse all JPEG images in the addon", since it's fixed upstream
This commit is contained in:
commit
82c5cf6617
@ -941,15 +941,6 @@ var JpegStream = (function JpegStreamClosure() {
|
|||||||
*/
|
*/
|
||||||
JpegStream.prototype.isNativelySupported =
|
JpegStream.prototype.isNativelySupported =
|
||||||
function JpegStream_isNativelySupported(xref, res) {
|
function JpegStream_isNativelySupported(xref, res) {
|
||||||
//#if FIREFOX
|
|
||||||
// // Workaround for:
|
|
||||||
// // - https://bugzilla.mozilla.org/show_bug.cgi?id=1164199.
|
|
||||||
// // - https://github.com/mozilla/pdf.js/issues/6017.
|
|
||||||
// // TODO: Remove this no later than July 1, 2015.
|
|
||||||
// if (/\bFirefox\/4[01].0/.test(navigator.userAgent)) {
|
|
||||||
// return false;
|
|
||||||
// }
|
|
||||||
//#endif
|
|
||||||
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';
|
||||||
};
|
};
|
||||||
@ -958,15 +949,6 @@ var JpegStream = (function JpegStreamClosure() {
|
|||||||
*/
|
*/
|
||||||
JpegStream.prototype.isNativelyDecodable =
|
JpegStream.prototype.isNativelyDecodable =
|
||||||
function JpegStream_isNativelyDecodable(xref, res) {
|
function JpegStream_isNativelyDecodable(xref, res) {
|
||||||
//#if FIREFOX
|
|
||||||
// // Workaround for:
|
|
||||||
// // - https://bugzilla.mozilla.org/show_bug.cgi?id=1164199.
|
|
||||||
// // - https://github.com/mozilla/pdf.js/issues/6017.
|
|
||||||
// // TODO: Remove this no later than July 1, 2015.
|
|
||||||
// if (/\bFirefox\/4[01].0/.test(navigator.userAgent)) {
|
|
||||||
// return false;
|
|
||||||
// }
|
|
||||||
//#endif
|
|
||||||
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;
|
var numComps = cs.numComps;
|
||||||
return numComps === 1 || numComps === 3;
|
return numComps === 1 || numComps === 3;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user