Added dependencies for SkPipe in SampleApp
Fixed SkGPipeWrite to reflect changes in SkDevice
git-svn-id: http://skia.googlecode.com/svn/trunk@1633 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/SampleApp.gyp b/gyp/SampleApp.gyp
index 04e07d6..b0df3a7 100644
--- a/gyp/SampleApp.gyp
+++ b/gyp/SampleApp.gyp
@@ -10,6 +10,7 @@
'include_dirs' : [
'../src/core', # needed to get SkConcaveToTriangle, maybe this should be moved to include dir?
'../gm', # SampleGM.cpp pulls gm.h
+ '../include/pipe', # To pull in SkGPipe.h for pipe reader/writer
],
'sources': [
# gm files needed for SampleGM.cpp
@@ -108,6 +109,10 @@
'../samplecode/SampleVertices.cpp',
'../samplecode/SampleXfermodes.cpp',
'../samplecode/SampleXfermodesBlur.cpp',
+
+ # Dependecies for the pipe code in SampleApp
+ '../src/pipe/SkGPipeRead.cpp',
+ '../src/pipe/SkGPipeWrite.cpp',
],
'sources!': [
'../samplecode/SampleSkLayer.cpp', #relies on SkMatrix44 which doesn't compile
diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp
index 428f864..5f928d7 100644
--- a/src/pipe/SkGPipeWrite.cpp
+++ b/src/pipe/SkGPipeWrite.cpp
@@ -267,9 +267,10 @@
// we need a device to limit our clip
// should the caller give us the bounds?
+ // We don't allocate pixels for the bitmap
SkBitmap bitmap;
bitmap.setConfig(SkBitmap::kARGB_8888_Config, 32767, 32767);
- SkDevice* device = SkNEW_ARGS(SkDevice, (this, bitmap, false));
+ SkDevice* device = SkNEW_ARGS(SkDevice, (bitmap));
this->setDevice(device)->unref();
}