From 7e882483fe73a9ee0626aa01e59f416f93ede80d Mon Sep 17 00:00:00 2001
From: ellson <devnull@localhost>
Date: Fri, 22 Jan 2010 03:56:12 +0000
Subject: [PATCH] Apply quartz patches from David Fang <fang@csl.cornell.edu>

---
 plugin/ming/gvrender_ming.c        | 2 +-
 plugin/quartz/gvloadimage_quartz.c | 6 +++++-
 plugin/quartz/gvplugin_quartz.h    | 5 ++++-
 plugin/quartz/gvrender_quartz.c    | 8 ++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/plugin/ming/gvrender_ming.c b/plugin/ming/gvrender_ming.c
index 4c6148b6c..5d8f3b126 100644
--- a/plugin/ming/gvrender_ming.c
+++ b/plugin/ming/gvrender_ming.c
@@ -94,7 +94,7 @@ static void ming_end_page(GVJ_t * job)
 extern char* gvconfig_libdir(void);
 #define FONT "Bitstream_Vera_Serif.fdb"
 
-static void ming_textpara(GVJ_t * job, pointf p, textitem_t * para)
+static void ming_textpara(GVJ_t * job, pointf p, textpara_t * para)
 {
     SWFMovie movie = (SWFMovie)(job->context);
     SWFTextField textfield;
diff --git a/plugin/quartz/gvloadimage_quartz.c b/plugin/quartz/gvloadimage_quartz.c
index ca3a52320..638291ac5 100644
--- a/plugin/quartz/gvloadimage_quartz.c
+++ b/plugin/quartz/gvloadimage_quartz.c
@@ -22,6 +22,10 @@
 #include <stddef.h>
 #include <string.h>
 
+#include <CGDataProvider.h>
+#include <CGImage.h>
+#include <CGGLContext.h>
+
 #include "gvplugin_loadimage.h"
 
 #include "gvplugin_quartz.h"
@@ -184,4 +188,4 @@ gvplugin_installed_t gvloadimage_quartz_types[] = {
 	{FORMAT_JPEG, "jpg:quartz", 8, &engine, NULL},
 	{FORMAT_PNG, "png:quartz", 8, &engine, NULL},
 	{0, NULL, 0, NULL, NULL}
-};
\ No newline at end of file
+};
diff --git a/plugin/quartz/gvplugin_quartz.h b/plugin/quartz/gvplugin_quartz.h
index 0b5ddbac4..914e1f4fb 100644
--- a/plugin/quartz/gvplugin_quartz.h
+++ b/plugin/quartz/gvplugin_quartz.h
@@ -17,7 +17,10 @@
 #ifndef GVPLUGIN_QUARTZ_H
 #define GVPLUGIN_QUARTZ_H
 
-#include <Availability.h>
+#include <CoreGraphics.h>
+#include <CGDataConsumer.h>
+#include <CGFont.h>
+#include <AvailabilityMacros.h>
 
 #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
 #include <ApplicationServices/ApplicationServices.h>
diff --git a/plugin/quartz/gvrender_quartz.c b/plugin/quartz/gvrender_quartz.c
index 33246e55e..7e8798199 100644
--- a/plugin/quartz/gvrender_quartz.c
+++ b/plugin/quartz/gvrender_quartz.c
@@ -21,12 +21,20 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <CGContext.h>
+#include <CGPDFContext.h>
+
 #include "gvplugin_device.h"
 #include "gvplugin_render.h"
 #include "graph.h"
 
 #include "gvplugin_quartz.h"
 
+#ifndef CGFLOAT_DEFINED
+/* nowhere defined, for Carbon Emacs the same work-around */
+typedef float CGFloat;
+#endif
+
 static CGFloat dashed[] = {6.0};
 static CGFloat dotted[] = {2.0, 6.0};
 
-- 
2.40.0