Remove PDF JPEG shortcut, since it fails on grayscale JPEGs.

src/pdf/SkPDFImage.cpp

Index: src/pdf/SkPDFImage.cpp
diff --git a/src/pdf/SkPDFImage.cpp b/src/pdf/SkPDFImage.cpp
index 0c9b7417a1d1254bca2cf618b182c75f87335b90..122d2f214845dfcc111bdbe262b020ec219eeba5 100644
--- a/src/pdf/SkPDFImage.cpp
+++ b/src/pdf/SkPDFImage.cpp
@@ -629,6 +629,7 @@ bool SkPDFImage::populate(SkPDFCatalog* catalog) {
     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 @@ public:
             "/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 @@ static bool is_jfif_jpeg(SkData* data) {
                             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 @@ SkPDFObject* SkPDFCreateImageObject(
                               (encodedData, bitmap.width(), bitmap.height()));
         }
     }
+#endif
     return SkPDFImage::CreateImage(bitmap, subset, encoder);
 }