fix fontsize, fontname

diff --git a/plugin/gdiplus/gvrender_gdiplus.cpp b/plugin/gdiplus/gvrender_gdiplus.cpp
index 0e66159bb811f3af9719ebd4db4be2e80d24a984..b12abd09f3a249d197a4c0c1476d93455f7ff24e 100755 (executable)
--- a/plugin/gdiplus/gvrender_gdiplus.cpp
+++ b/plugin/gdiplus/gvrender_gdiplus.cpp
@@ -177,7 +177,7 @@ static void gdiplusgen_textspan(GVJ_t *job, pointf p, textspan_t *span)
        if (span->free_layout == &gdiplus_free_layout)
                layout = (Layout*)span->layout;
        else
-               layout = new Layout(span->fontname, span->fontsize, span->str);
+               layout = new Layout(span->font->name, span->font->size, span->str);
 
                /* draw the text */
                SolidBrush brush(Color(job->obj->pencolor.u.rgba [3], job->obj->pencolor.u.rgba [0], job->obj->pencolor.u.rgba [1], job->obj->pencolor.u.rgba [2]));

diff --git a/plugin/gdiplus/gvtextlayout_gdiplus.cpp b/plugin/gdiplus/gvtextlayout_gdiplus.cpp
index 8930fedd7edfb317400ff7cbe8d597df18321841..606ce85125b2f0b4c739085eb01431f2d7b7a5d3 100755 (executable)
--- a/plugin/gdiplus/gvtextlayout_gdiplus.cpp
+++ b/plugin/gdiplus/gvtextlayout_gdiplus.cpp
@@ -82,7 +82,7 @@ boolean gdiplus_textlayout(textspan_t *span, char **fontpath)
        /* ensure GDI+ is started up: since we get called outside of a job, we can't rely on GDI+ startup then */
        UseGdiplus();
        
-       Layout* layout = new Layout(span->fontname, span->fontsize, span->str);
+       Layout* layout = new Layout(span->font->name, span->font->size, span->str);
        
        /* measure the text */
        /* NOTE: use TextRenderingHintAntiAlias + GetGenericTypographic to get a layout without extra space at beginning and end */