Fixed include statements to correctly link mac/ios libraries

git-svn-id: http://skia.googlecode.com/svn/trunk@1712 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/src/core/SkAdvancedTypefaceMetrics.cpp b/src/core/SkAdvancedTypefaceMetrics.cpp
index d902224..e74a5cd 100644 (file)
--- a/src/core/SkAdvancedTypefaceMetrics.cpp
+++ b/src/core/SkAdvancedTypefaceMetrics.cpp
@@ -29,6 +29,7 @@
 #ifdef SK_BUILD_FOR_IOS
 #include <CoreText/CoreText.h>
 #include <CoreGraphics/CoreGraphics.h>
+#include <CoreFoundation/CoreFoundation.h>
 #endif
 
 namespace skia_advanced_typeface_metrics_utils {

diff --git a/src/ports/SkImageDecoder_CG.cpp b/src/ports/SkImageDecoder_CG.cpp
index 0e8b95b..dc9437f 100644 (file)
--- a/src/ports/SkImageDecoder_CG.cpp
+++ b/src/ports/SkImageDecoder_CG.cpp
@@ -20,13 +20,13 @@
 #include "SkTemplates.h"
 #include "SkCGUtils.h"
 
-//#ifdef SK_BUILD_FOR_MAC
-//#include <ApplicationServices/ApplicationServices.h>
-//#endif
-//
-//#ifdef SK_BUILD_FOR_IOS
-//#include <CoreGraphics/CoreGraphics.h>
-//#endif
+#ifdef SK_BUILD_FOR_MAC
+#include <ApplicationServices/ApplicationServices.h>
+#endif
+
+#ifdef SK_BUILD_FOR_IOS
+#include <CoreGraphics/CoreGraphics.h>
+#endif
 
 static void malloc_release_proc(void* info, const void* data, size_t size) {
     sk_free(info);