aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--gm/gmmain.cpp2
-rw-r--r--gyp/gm.gyp11
2 files changed, 10 insertions, 3 deletions
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 254a6247f6..e74b0bc7d3 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -463,7 +463,7 @@ static bool test_drawing(GM* gm,
} else if (gRec.fBackend == kPDF_Backend) {
generate_pdf(gm, document);
#if CAN_IMAGE_PDF
- SkAutoDataUnref data(pdf.copyToData());
+ SkAutoDataUnref data(document.copyToData());
SkMemoryStream stream(data.data(), data.size());
SkPDFDocumentToBitmap(&stream, bitmap);
#endif
diff --git a/gyp/gm.gyp b/gyp/gm.gyp
index 716e05623e..fc43221947 100644
--- a/gyp/gm.gyp
+++ b/gyp/gm.gyp
@@ -43,9 +43,16 @@
'gpu.gyp:skgr',
'images.gyp:images',
'pdf.gyp:pdf',
- 'utils.gyp:utils',
- 'xps.gyp:xps',
+ 'utils.gyp:utils',
],
+ #mac does not like empty dependency.
+ 'conditions': [
+ [ 'skia_os == "win"', {
+ 'dependencies': [
+ 'xps.gyp:xps',
+ ],
+ }],
+ ],
},
],
}