Remove PDF JPEG shortcut, since it fails on grayscale JPEGs.
BUG=436079
Review URL: https://codereview.chromium.org/767343002
Review URL: https://codereview.chromium.org/782023002
diff --git a/src/pdf/SkPDFImage.cpp b/src/pdf/SkPDFImage.cpp
index 0c9b741..122d2f2 100644
--- a/src/pdf/SkPDFImage.cpp
+++ b/src/pdf/SkPDFImage.cpp
@@ -629,6 +629,7 @@
return true;
}
+#if 0 // reenable when we can figure out the JPEG colorspace
namespace {
/**
* This PDFObject assumes that its constructor was handed
@@ -657,7 +658,7 @@
"/Subtype /Image\n"
"/Width %d\n"
"/Height %d\n"
- "/ColorSpace /DeviceRGB\n"
+ "/ColorSpace /DeviceRGB\n" // or DeviceGray
"/BitsPerComponent 8\n"
"/Filter /DCTDecode\n"
"/ColorTransform 0\n"
@@ -702,11 +703,13 @@
sizeof(bytesSixToTen))));
}
} // namespace
+#endif
SkPDFObject* SkPDFCreateImageObject(
const SkBitmap& bitmap,
const SkIRect& subset,
SkPicture::EncodeBitmap encoder) {
+#if 0 // reenable when we can figure out the JPEG colorspace
if (SkIRect::MakeWH(bitmap.width(), bitmap.height()) == subset) {
SkAutoTUnref<SkData> encodedData(ref_encoded_data(bitmap));
if (is_jfif_jpeg(encodedData)) {
@@ -714,5 +717,6 @@
(encodedData, bitmap.width(), bitmap.height()));
}
}
+#endif
return SkPDFImage::CreateImage(bitmap, subset, encoder);
}
diff --git a/tests/PDFJpegEmbedTest.cpp b/tests/PDFJpegEmbedTest.cpp
index c1d0ea8..422b59a 100644
--- a/tests/PDFJpegEmbedTest.cpp
+++ b/tests/PDFJpegEmbedTest.cpp
@@ -84,7 +84,8 @@
SkASSERT(pdfData);
pdf.reset();
- REPORTER_ASSERT(r, is_subset_of(mandrillData, pdfData));
+ // Test disabled, waiting on resolution to http://skbug.com/3180
+ // REPORTER_ASSERT(r, is_subset_of(mandrillData, pdfData));
// This JPEG uses a nonstandard colorspace - it can not be
// embedded into the PDF directly.
