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

src/pdf/SkPDFImage.cpp

 /*
  * Copyright 2010 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPDFImage.h"
 
 #include "SkBitmap.h"
@@ skipping 611 matching lines @@
         if (!getSubstitute()) {
             SkPDFStream* substitute = SkNEW_ARGS(SkPDFImage, (*this));
             setSubstitute(substitute);
             catalog->setSubstitute(this, substitute);
         }
         return false;
     }
     return true;
 }
 
+#if 0  // reenable when we can figure out the JPEG colorspace
 namespace {
 /**
  *  This PDFObject assumes that its constructor was handed
  *  Jpeg-encoded data that can be directly embedded into a PDF.
  */
 class PDFJPEGImage : public SkPDFObject {
     SkAutoTUnref<SkData> fData;
     int fWidth;
     int fHeight;
 public:
     PDFJPEGImage(SkData* data, int width, int height)
         : fData(SkRef(data)), fWidth(width), fHeight(height) {}
     virtual void getResources(const SkTSet<SkPDFObject*>&,
                               SkTSet<SkPDFObject*>*) SK_OVERRIDE {}
     virtual void emitObject(
             SkWStream* stream,
             SkPDFCatalog* catalog, bool indirect) SK_OVERRIDE {
         if (indirect) {
             this->emitIndirectObject(stream, catalog);
             return;
         }
         SkASSERT(fData.get());
         const char kPrefaceFormat[] =
             "<<"
             "/Type /XObject\n"
             "/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"
             "/Length " SK_SIZE_T_SPECIFIER "\n"
             ">> stream\n";
         SkString preface(
                 SkStringPrintf(kPrefaceFormat, fWidth, fHeight, fData->size()));
         const char kPostface[] = "\nendstream";
         stream->write(preface.c_str(), preface.size());
         stream->write(fData->data(), fData->size());
@@ skipping 24 matching lines @@
     const uint8_t bytesZeroToThree[] = {0xFF, 0xD8, 0xFF, 0xE0};
     const uint8_t bytesSixToTen[] = {'J', 'F', 'I', 'F', 0};
     // 0   1   2   3   4   5   6   7   8   9   10
     // FF  D8  FF  E0  ??  ??  'J' 'F' 'I' 'F' 00 ...
     return ((0 == memcmp(data->bytes(), bytesZeroToThree,
                          sizeof(bytesZeroToThree)))
             && (0 == memcmp(data->bytes() + 6, bytesSixToTen,
                             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)) {
             return SkNEW_ARGS(PDFJPEGImage,
                               (encodedData, bitmap.width(), bitmap.height()));
         }
     }
+#endif
     return SkPDFImage::CreateImage(bitmap, subset, encoder);
 }