PDF: Add (low-memory) SkPDFBitmap class

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"
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkData.h"
 #include "SkFlate.h"
+#include "SkPDFBitmap.h"
 #include "SkPDFCatalog.h"
 #include "SkPixelRef.h"
 #include "SkRect.h"
 #include "SkStream.h"
 #include "SkString.h"
 #include "SkUnPreMultiply.h"
 
 static const int kNoColorTransform = 0;
 
 static bool skip_compression(SkPDFCatalog* catalog) {
@@ skipping 691 matching lines @@
             && (0 == memcmp(data->bytes() + 6, bytesSixToTen,
                             sizeof(bytesSixToTen))));
 }
 }  // namespace
 #endif
 
 SkPDFObject* SkPDFCreateImageObject(
         const SkBitmap& bitmap,
         const SkIRect& subset,
         SkPicture::EncodeBitmap encoder) {
+    SkPDFObject* pdfBitmap = SkPDFBitmap::Create(bitmap, subset);
+    if (pdfBitmap) {

[mtklein, 2015/02/12 00:21:46]

Even

if (SkPDFObject* pdfBitmap = SkPDFBitmap::Create(bitmap, subset)) {
    return pdfBitmap;
}

[hal.canary, 2015/02/12 21:28:03]

Done.

+        return pdfBitmap;
+    }
 #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);
 }