[xine-cvs] CVS: xine-lib/src/xine-engine osd.c,1.70,1.71

[Miguel F. <mig...@us...>]

Update of /cvsroot/xine/xine-lib/src/xine-engine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30469

Modified Files:
	osd.c 
Log Message:
try to be friendly to older ft2 releases


Index: osd.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/osd.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- osd.c	5 Feb 2005 20:31:04 -0000	1.70
+++ osd.c	18 Apr 2005 14:06:29 -0000	1.71
@@ -89,6 +89,15 @@
 #endif
 #define MIN(a,b) ( (a) < (b) ) ? (a) : (b)
 
+
+#if (FREETYPE_MAJOR > 2) || \
+    (FREETYPE_MAJOR == 2 && FREETYPE_MINOR > 1) || \
+    (FREETYPE_MAJOR == 2 && FREETYPE_MINOR == 1 && FREETYPE_PATCH >= 3)
+#  define KERNING_DEFAULT FT_KERNING_DEFAULT
+#else
+#  define KERNING_DEFAULT ft_kerning_default
+#endif
+
 typedef struct osd_fontchar_s {
   uint16_t code;
   uint16_t width;
@@ -1052,7 +1061,7 @@
       /* add kerning relative to the previous letter */
       if (use_kerning && previous && i) {
         FT_Vector delta;
-        FT_Get_Kerning(osd->ft2->face, previous, i, FT_KERNING_DEFAULT, &delta);
+        FT_Get_Kerning(osd->ft2->face, previous, i, KERNING_DEFAULT, &delta);
         x1 += delta.x / 64;
       }
       previous = i;
@@ -1218,7 +1227,7 @@
       /* kerning add the relative to the previous letter */
       if (use_kerning && previous && i) {
         FT_Vector delta;
-        FT_Get_Kerning(osd->ft2->face, previous, i, FT_KERNING_DEFAULT, &delta);
+        FT_Get_Kerning(osd->ft2->face, previous, i, KERNING_DEFAULT, &delta);
         *width += delta.x / 64;
       }
       previous = i;