diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2010-12-20 20:53:13 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2010-12-20 20:53:13 +0000 |
| commit | d642329293cce602ac24df8f585c14a98795da87 (patch) | |
| tree | 8a108d78f0194acf6eef86e746adfe1e121d8d0a | |
| parent | 0770044da6d61dcbc8d9673fed8dd92460faa314 (diff) | |
remove ZLIB include from SkUserConfig for how (doesn't work on mac sampleapp) but,
add it to Makefile if SKIA_PDF_SUPPORT is true
Use compile_assert (yea!)
git-svn-id: http://skia.googlecode.com/svn/trunk@643 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | include/config/SkUserConfig.h | 2 | ||||
| -rw-r--r-- | src/core/SkCanvas.cpp | 3 |
3 files changed, 3 insertions, 3 deletions
@@ -26,6 +26,7 @@ DEFINES += -DSK_SUPPORT_LCDTEXT ifeq ($(SKIA_PDF_SUPPORT),true) DEFINES += -DSK_SUPPORT_PDF + DEFINES += -DSK_ZLIB_INCLUDE="<zlib.h>" endif # start with the core (required) diff --git a/include/config/SkUserConfig.h b/include/config/SkUserConfig.h index 721f5f76c9..a2df7456e3 100644 --- a/include/config/SkUserConfig.h +++ b/include/config/SkUserConfig.h @@ -121,7 +121,7 @@ algorithm (used in PDF generation), define SK_ZLIB_INCLUDE to be the include path. */ -#define SK_ZLIB_INCLUDE <zlib.h> +//#define SK_ZLIB_INCLUDE <zlib.h> /* If SK_DEBUG is defined, then you can optionally define SK_SUPPORT_UNITTEST which will run additional self-tests at startup. These can take a long time, diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 0e36c91a4b..764e063282 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1477,8 +1477,7 @@ void SkCanvas::drawShape(SkShape* shape) { /////////////////////////////////////////////////////////////////////////////// SkCanvas::LayerIter::LayerIter(SkCanvas* canvas, bool skipEmptyClips) { - // need COMPILE_TIME_ASSERT - SkASSERT(sizeof(fStorage) >= sizeof(SkDrawIter)); + SK_COMPILE_ASSERT(sizeof(fStorage) >= sizeof(SkDrawIter), fStorage_too_small); SkASSERT(canvas); |