[cp-patches] FYI: Werror fixlet in GdkTextLayout

[Mark Wielaard]

Hi,

This makes the build work again with --enable-Werror. It initializes the
whole FT_Outline_Funcs struct and makes the Freetype callback functions
types as expected.

2005-09-30  Mark Wielaard  <address@hidden>

    * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
    (Java_gnu_java_awt_peer_gtk_GdkTextLayout_getOutline): Initialize
    all fields of the FT_Outline_Funcs ftCallbacks struct.
    (_moveTo): Takes an void * as argument.
    (_lineTo): Likewise.
    (_quadTo): Likewise.
    (_curveTo): Likewise.

Committed,

Mark

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c,v
retrieving revision 1.9
diff -u -r1.9 gnu_java_awt_peer_gtk_GdkTextLayout.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c   29 Sep 2005 
13:41:50 -0000      1.9
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c   30 Sep 2005 
09:47:07 -0000
@@ -1,5 +1,5 @@
 /* gnu_java_awt_GdkTextLayout.c
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
    
    This file is part of GNU Classpath.
    
@@ -211,13 +211,14 @@
 /********* Freetype callback functions *****************************/
 
 static int _moveTo( FT_Vector* to,
-                   generalpath *path)
+                   void *p)
 {
   JNIEnv *env;
   jobject obj;
   jclass cls;
   jmethodID method;
   jvalue values[2];
+  generalpath *path = (generalpath *) p;
 
   env = path->env;
   obj = path->obj;
@@ -233,13 +234,14 @@
 }
 
 static int _lineTo( FT_Vector*  to,
-                   generalpath *path)
+                   void *p)
 {
   JNIEnv *env;
   jobject obj;
   jclass cls;
   jmethodID method;
   jvalue values[2];
+  generalpath *path = (generalpath *) p;
 
   env = path->env;
   obj = path->obj; 
@@ -255,13 +257,14 @@
 
 static int _quadTo( FT_Vector*  cp,
                    FT_Vector*  to,
-                   generalpath *path)
+                   void *p)
 {
   JNIEnv *env;
   jobject obj;
   jclass cls;
   jmethodID method;
   jvalue values[4];
+  generalpath *path = (generalpath *) p;
 
   env = path->env;
   obj = path->obj;
@@ -280,13 +283,14 @@
 static int _curveTo( FT_Vector*  cp1,
                     FT_Vector*  cp2,
                     FT_Vector*  to,
-                    generalpath *path)
+                    void *p)
 {
   JNIEnv *env;
   jobject obj;
   jclass cls;
   jmethodID method;
   jvalue values[6];
+  generalpath *path = (generalpath *) p;
 
   env = path->env;
   obj = path->obj;
@@ -319,7 +323,9 @@
       _moveTo,
       _lineTo,
       _quadTo,
-      _curveTo
+      _curveTo,
+      0,
+      0
     };
   PangoLayoutIter* layoutIterator;

signature.asc
Description: This is a digitally signed message part