From b939bf3c40c8f83943b2ee0662f7068fe56526f2 Mon Sep 17 00:00:00 2001
From: sdteffen <sdteffen>
Date: Mon, 12 Jan 2004 02:26:12 +0000
Subject: [PATCH] 	* app/diapsftrenderer.c: including ftoutln.h 	*
 app/makefile.msc: updated for freetype build 	* lib/libdia.def: added
 dia_font_get_context() 	* lib/dialibartrenderer.c (draw_string): added
 cast

---
 ChangeLog               | 7 +++++++
 app/diapsft2renderer.c  | 1 +
 app/makefile.msc        | 4 ++--
 lib/dialibartrenderer.c | 4 ++--
 lib/libdia.def          | 1 +
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5721dd04..4f71d560 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-11  Steffen Macke <sdteffen@web.de>
+
+	* app/diapsftrenderer.c: including ftoutln.h
+	* app/makefile.msc: updated for freetype build
+	* lib/libdia.def: added dia_font_get_context()
+	* lib/dialibartrenderer.c (draw_string): added cast
+	
 2004-01-10  Hans Breuer  <hans@breuer.org>
 
 	* lib/diagdkrenderer.c (draw_string) : gdk_draw_line with
diff --git a/app/diapsft2renderer.c b/app/diapsft2renderer.c
index 0f765004..3d30757d 100644
--- a/app/diapsft2renderer.c
+++ b/app/diapsft2renderer.c
@@ -28,6 +28,7 @@
 #include <pango/pangoft2.h>
 /* I'd really rather avoid this */
 #include <freetype/ftglyph.h>
+#include <freetype/ftoutln.h>
 
 #define DPI 300
 
diff --git a/app/makefile.msc b/app/makefile.msc
index e7d98c39..082ab279 100644
--- a/app/makefile.msc
+++ b/app/makefile.msc
@@ -17,7 +17,7 @@ PKG_CFLAGS = -FImsvc_recommended_pragmas.h \
 PKG_LINK = $(GTK2_LIBS) $(GLIB_LIBS) $(PANGOWIN32_LIBS) \
 	$(LIBXML2_LIBS) $(PNG_LIBS) \
 	$(PRJ_TOP)\lib\libdia.lib $(LIBART_LIBS) \
-	$(GDK_PIXBUF_LIBS) $(INTL_LIBS)
+	$(GDK_PIXBUF_LIBS) $(INTL_LIBS) $(TOP)\lib\libfreetype.lib
 
 OBJECTS = \
 	autosave.obj \
@@ -36,7 +36,7 @@ OBJECTS = \
 	diagram_tree_window.obj \
 	dialogs.obj \
 	diapagelayout.obj \
-#	diapsft2renderer.obj \
+	diapsft2renderer.obj \
 	diapsrenderer.obj \
 	dia-props.obj \
 	diaunitspinner.obj \
diff --git a/lib/dialibartrenderer.c b/lib/dialibartrenderer.c
index 6da9039e..763acd34 100644
--- a/lib/dialibartrenderer.c
+++ b/lib/dialibartrenderer.c
@@ -1061,7 +1061,7 @@ draw_string (DiaRenderer *self,
    
    font = pango_context_load_font(pango_ft2_get_context(75, 75),
 				  self->font->pfd);
-   face = pango_ft2_font_get_face(font);
+   face = (FT_Face *)pango_ft2_font_get_face(font);
 
    graybitmap = (guint8*)g_new0(guint8, height*rowstride);
 
@@ -1183,7 +1183,7 @@ get_text_width(DiaRenderer *object,
   if (length != strlen(text)) {
     char *othertx;
     int ulen;
-    /* A couple UTF8-chars: æblegrød Š Ť Ž ę ć ń уфхцНОПРЄ є Ґ Њ Ћ Џ */
+    /* A couple UTF8-chars: æblegrød Å  Ť Ž Ä™ ć Å„ уфхцÐ?ОПРЄ Ñ” Ò? Њ Ћ Ð? */
     ulen = g_utf8_offset_to_pointer(text, length)-text;
     if (!g_utf8_validate(text, ulen, NULL)) {
       g_warning ("Text at char %d not valid\n", length);
diff --git a/lib/libdia.def b/lib/libdia.def
index b4f51c22..c9eed341 100644
--- a/lib/libdia.def
+++ b/lib/libdia.def
@@ -163,6 +163,7 @@ EXPORTS
  dia_font_ascent
  dia_font_build_layout
  dia_font_descent
+ dia_font_get_context
  dia_font_get_family
  dia_font_get_height
  dia_font_get_legacy_name
-- 
2.11.4.GIT