diff options
| author |  vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-24 23:13:47 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-24 23:13:47 +0000 |
| commit | 0f1c95cd67a056cff9c9cd31fa51d9de9392142e (patch) | |
| tree | adc2b9fa11a31dde83b64cb8661ff4cb083a68a6 | |
| parent | ae8a2e5cba553267b189b8b5cae40330c4ff5bdb (diff) | |
Add a zlib target that the pdf target can depend on.
- make drawTextOnPath (now used by shadertext) a non fatal NOT_IMPLEMENTED on PDF.
Review URL: http://codereview.appspot.com/4631071
git-svn-id: http://skia.googlecode.com/svn/trunk@1722 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gyp/core.gyp | 2 | ||||
| -rw-r--r-- | gyp/pdf.gyp | 3 | ||||
| -rw-r--r-- | gyp/zlib.gyp | 40 | ||||
| -rw-r--r-- | src/pdf/SkPDFDevice.cpp | 2 |
4 files changed, 44 insertions, 3 deletions
diff --git a/gyp/core.gyp b/gyp/core.gyp index c02d1f5d5d..4cc0252b5b 100644 --- a/gyp/core.gyp +++ b/gyp/core.gyp @@ -69,7 +69,6 @@ '../src/core/SkFP.h', '../src/core/SkFilterProc.cpp', '../src/core/SkFilterProc.h', - '../src/core/SkFlate.cpp', '../src/core/SkFlattenable.cpp', '../src/core/SkFloat.cpp', '../src/core/SkFloat.h', @@ -187,7 +186,6 @@ '../include/core/SkEndian.h', '../include/core/SkFDot6.h', '../include/core/SkFixed.h', - '../include/core/SkFlate.h', '../include/core/SkFlattenable.h', '../include/core/SkFloatBits.h', '../include/core/SkFloatingPoint.h', diff --git a/gyp/pdf.gyp b/gyp/pdf.gyp index 59aba08c77..eb1dea01de 100644 --- a/gyp/pdf.gyp +++ b/gyp/pdf.gyp @@ -49,6 +49,9 @@ '../include/pdf', ], }, + 'dependencies': [ + 'zlib.gyp:zlib', + ], }, ], } diff --git a/gyp/zlib.gyp b/gyp/zlib.gyp new file mode 100644 index 0000000000..d47a13ee9c --- /dev/null +++ b/gyp/zlib.gyp @@ -0,0 +1,40 @@ +{ + 'includes': [ + 'target_defaults.gypi', + ], + 'targets': [ + { + 'target_name': 'zlib', + 'type': 'static_library', + 'include_dirs': [ + '../include/config', + '../include/core', + ], + 'sources': [ + '../include/core/SkFlate.h', + + '../src/core/SkFlate.cpp', + ], + 'conditions': [ + [ 'OS == "mac"', { + 'link_settings': { + 'libraries': [ + '$(SDKROOT)/usr/lib/libz.dylib', + ], + }, + 'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ], + }], + [ 'OS == "linux"', { + 'link_settings': { 'libraries': [ '-lz', ], }, + 'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ], + }], + ], + }, + ], +} + +# Local Variables: +# tab-width:2 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp index 8ead3c8487..bd944710e8 100644 --- a/src/pdf/SkPDFDevice.cpp +++ b/src/pdf/SkPDFDevice.cpp @@ -926,7 +926,7 @@ void SkPDFDevice::drawTextOnPath(const SkDraw& d, const void* text, size_t len, if (d.fClip->isEmpty()) { return; } - NOT_IMPLEMENTED("drawTextOnPath", true); + NOT_IMPLEMENTED("drawTextOnPath", false); } void SkPDFDevice::drawVertices(const SkDraw& d, SkCanvas::VertexMode, |