aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-09-18 15:41:18 +0000
committerGravatar caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-09-18 15:41:18 +0000
commit35f5ac9738b938e4f4cf3e575f7cc095fa1f59b0 (patch)
treeae14a7cb9530c6bf16f0153ae7f0aa84feba0c71 /src
parent7112173c3c4cd1b1e7da8cdf971d71f01dd91299 (diff)
update gyp files to build on iOS
Note that there's a hack in SkImageDecoder_CG.cpp -- the necessary defines are included directly. This is temporary until I can figure out how to include them properly. Review URL: https://codereview.appspot.com/6523044 git-svn-id: http://skia.googlecode.com/svn/trunk@5586 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r--src/ports/SkImageDecoder_CG.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ports/SkImageDecoder_CG.cpp b/src/ports/SkImageDecoder_CG.cpp
index 26f574494f..ac2eb0e03d 100644
--- a/src/ports/SkImageDecoder_CG.cpp
+++ b/src/ports/SkImageDecoder_CG.cpp
@@ -20,6 +20,10 @@
#ifdef SK_BUILD_FOR_IOS
#include <CoreGraphics/CoreGraphics.h>
+#include <ImageIO/ImageIO.h>
+//#include <UTCoreTypes.h> // FIXME: hack -- can't figure out how to include this
+extern const CFStringRef kUTTypeJPEG __OSX_AVAILABLE_STARTING(__MAC_10_4,__IPHONE_3_0);
+extern const CFStringRef kUTTypePNG __OSX_AVAILABLE_STARTING(__MAC_10_4,__IPHONE_3_0);
#endif
static void malloc_release_proc(void* info, const void* data, size_t size) {