Fix quartz renderers to work with new font API.

diff --git a/plugin/quartz/gvrender_quartz.c b/plugin/quartz/gvrender_quartz.c
index 5b60ecddf831ad2a225249fa70d1e9e080084034..2225dd154401c91373d31d378bb41ae96e5b0620 100644 (file)
--- a/plugin/quartz/gvrender_quartz.c
+++ b/plugin/quartz/gvrender_quartz.c
@@ -324,21 +324,21 @@ static void quartzgen_path(GVJ_t * job, int filled)
     CGContextDrawPath(context, filled ? kCGPathFillStroke : kCGPathStroke);
 }
 
-void quartzgen_textpara(GVJ_t * job, pointf p, textpara_t * para)
+void quartzgen_textpara(GVJ_t * job, pointf p, textspan_t * para)
 {
     CGContextRef context = (CGContextRef) job->context;
 
     /* adjust text position */
     switch (para->just) {
     case 'r':
-       p.x -= para->width;
+       p.x -= para->size.x;
        break;
     case 'l':
        p.x -= 0.0;
        break;
     case 'n':
     default:
-       p.x -= para->width / 2.0;
+       p.x -= para->size.x / 2.0;
        break;
     }
     p.y += para->yoffset_centerline;
@@ -348,7 +348,7 @@ void quartzgen_textpara(GVJ_t * job, pointf p, textpara_t * para)
        layout = para->layout;
     else
        layout =
-           quartz_new_layout(para->fontname, para->fontsize, para->str);
+           quartz_new_layout(para->font->name, para->font->size, para->str);
 
 #if __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ >= 20000
     CGContextSaveGState(context);

diff --git a/plugin/quartz/gvtextlayout_quartz.c b/plugin/quartz/gvtextlayout_quartz.c
index 6761511f0d196e8730b329b55f78a56e1918c439..26bdfd4bacece51ea152b381fa02b512725e508d 100644 (file)
--- a/plugin/quartz/gvtextlayout_quartz.c
+++ b/plugin/quartz/gvtextlayout_quartz.c
@@ -104,7 +104,7 @@ void quartz_free_layout(void *layout)
 
 #endif
 
-boolean quartz_textlayout(textpara_t *para, char **fontpath)
+boolean quartz_textlayout(textspan_t *para, char **fontpath)
 {
        void *line = quartz_new_layout(para->font->name, para->font->size, para->str);
        if (line)
@@ -113,7 +113,7 @@ boolean quartz_textlayout(textpara_t *para, char **fontpath)
                para->layout = (void*)line;
                para->free_layout = &quartz_free_layout;
                para->yoffset_centerline = 0;
-               quartz_size_layout((void*)line, &para->width, &para->height, &para->yoffset_layout);
+               quartz_size_layout((void*)line, &para->size.x, &para->size.y, &para->yoffset_layout);
                return TRUE;
        }
        else