diff options
author | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-24 19:33:57 +0000 |
---|---|---|
committer | caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-09-24 19:33:57 +0000 |
commit | 594dd3cd78e2f970d53bb0934fbbb63b41e1d40c (patch) | |
tree | aeb48bc17abb7631ecac0998dc8b1609b386670b /include | |
parent | cdb426d55a4bc4dae4f6d4f23e6994762950fdc3 (diff) |
iOS support work in progress
include/core/SkTypes.h
- address unsigned warning
include/core/SkInstCnt.h
src/core/SkInstCnt.cpp
gyp/common.gypi
- always define SK_ENABLE_INST_COUNT for debug builds
src/views/mac/SkNSView.mm
- only call glClear if there is a GL context
src/ports/SkImageDecoder_CG.cpp
- fix iOS hack by using proper include
gyp/opts.gyp
- exclude more ARM files from iOS for now (see issue 900)
gyp/common_conditions.gypi
- add release, more ios specific common settings
gyp/bench.gyp
- add iOS condition
gyp/SampleApp.gyp
- remove precompiled header, hardcoded SDK path
- add more frameworks
gyp/debugger.gyp
- fix syntax error
- add iOS/Android condition
gyp/core.gyp
- remove hardcoded SDK path, add more frameworks
gyp/common_variables.gypi
- add ios SDK path
- add ios SDK version
gyp/iOSSampleApp.gyp
- remove obsolete project
gyp/zlib.gyp
- add ios library path
Review URL: https://codereview.appspot.com/6551070
git-svn-id: http://skia.googlecode.com/svn/trunk@5649 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
-rw-r--r-- | include/core/SkInstCnt.h | 4 | ||||
-rw-r--r-- | include/core/SkTypes.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/core/SkInstCnt.h b/include/core/SkInstCnt.h index 09ce0ca1b1..6866be994d 100644 --- a/include/core/SkInstCnt.h +++ b/include/core/SkInstCnt.h @@ -18,6 +18,10 @@ * At the end of an application a call to all the "root" objects' * CheckInstanceCount methods should be made */ +#if defined SK_DEBUG && !defined SK_ENABLE_INST_COUNT +#define SK_ENABLE_INST_COUNT +#endif + #ifdef SK_ENABLE_INST_COUNT #include <stdlib.h> #include "SkTArray.h" diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h index eb87181e7f..d44c560412 100644 --- a/include/core/SkTypes.h +++ b/include/core/SkTypes.h @@ -185,7 +185,7 @@ typedef uint8_t SkBool8; #define SK_MaxU16 0xFFFF #define SK_MinU16 0 #define SK_MaxS32 0x7FFFFFFF -#define SK_MinS32 0x80000001 +#define SK_MinS32 -SK_MaxS32 #define SK_MaxU32 0xFFFFFFFF #define SK_MinU32 0 #define SK_NaN32 0x80000000 |