SkPDF: Implement drawImage*() properly

tests/PDFJpegEmbedTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDocument.h"
 #include "SkCanvas.h"
 #include "SkImageGenerator.h"
@@ skipping 44 matching lines @@
  *  makes sense.
  */
 DEF_TEST(PDFJpegEmbedTest, r) {
     const char test[] = "PDFJpegEmbedTest";
     SkAutoTUnref<SkData> mandrillData(
             load_resource(r, test, "mandrill_512_q075.jpg"));
     SkAutoTUnref<SkData> cmykData(load_resource(r, test, "CMYK.jpg"));
     if (!mandrillData || !cmykData) {
         return;
     }
-
+    ////////////////////////////////////////////////////////////////////////////
     SkDynamicMemoryWStream pdf;
     SkAutoTUnref<SkDocument> document(SkDocument::CreatePDF(&pdf));
     SkCanvas* canvas = document->beginPage(642, 1028);
 
     canvas->clear(SK_ColorLTGRAY);
 
     SkBitmap bm1(bitmap_from_data(mandrillData));
     canvas->drawBitmap(bm1, 65.0, 0.0, nullptr);
     SkBitmap bm2(bitmap_from_data(cmykData));
     canvas->drawBitmap(bm2, 0.0, 512.0, nullptr);
 
     canvas->flush();
     document->endPage();
     document->close();
     SkAutoTUnref<SkData> pdfData(pdf.copyToData());
     SkASSERT(pdfData);
     pdf.reset();
 
     REPORTER_ASSERT(r, is_subset_of(mandrillData, pdfData));
 
     // This JPEG uses a nonstandard colorspace - it can not be
     // embedded into the PDF directly.
     REPORTER_ASSERT(r, !is_subset_of(cmykData, pdfData));
+    ////////////////////////////////////////////////////////////////////////////
+    pdf.reset();
+    document.reset(SkDocument::CreatePDF(&pdf));
+    canvas = document->beginPage(642, 1028);
+
+    canvas->clear(SK_ColorLTGRAY);
+
+    SkAutoTUnref<SkImage> im1(SkImage::NewFromEncoded(mandrillData));
+    canvas->drawImage(im1, 65.0, 0.0, nullptr);
+    SkAutoTUnref<SkImage> im2(SkImage::NewFromEncoded(cmykData));
+    canvas->drawImage(im2, 0.0, 512.0, nullptr);
+
+    canvas->flush();
+    document->endPage();
+    document->close();
+    pdfData.reset(pdf.copyToData());
+    SkASSERT(pdfData);
+    pdf.reset();
+
+    REPORTER_ASSERT(r, is_subset_of(mandrillData, pdfData));
+
+    // This JPEG uses a nonstandard colorspace - it can not be
+    // embedded into the PDF directly.
+    REPORTER_ASSERT(r, !is_subset_of(cmykData, pdfData));
 }
 
 #include "SkJpegInfo.h"
 
 DEF_TEST(JpegIdentification, r) {
     static struct {
         const char* path;
         bool isJfif;
         SkJFIFInfo::Type type;
     } kTests[] = {{"CMYK.jpg", false, SkJFIFInfo::kGrayscale},
@@ skipping 15 matching lines @@
         }
         if (!isJfif) {
             continue;  // not applicable
         }
         if (kTests[i].type != info.fType) {
             ERRORF(r, "%s failed jfif type test", kTests[i].path);
             continue;
         }
         if (r->verbose()) {
             SkDebugf("\nJpegIdentification: %s [%d x %d]\n", kTests[i].path,
-                     info.fWidth, info.fHeight);
+                     info.fSize.width(), info.fSize.height());
         }
     }
 }