[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commit-cp] classpath gnu/java/awt/peer/gtkFreetypeGlyphVec...
From: |
Sven de Marothy |
Subject: |
[commit-cp] classpath gnu/java/awt/peer/gtkFreetypeGlyphVec... |
Date: |
Wed, 07 Jun 2006 23:48:05 +0000 |
CVSROOT: /sources/classpath
Module name: classpath
Changes by: Sven de Marothy <smarothy> 06/06/07 23:48:05
Modified files:
gnu/java/awt/peer/gtk: FreetypeGlyphVector.java
native/jni/gtk-peer: gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
Log message:
2006-06-08 Sven de Marothy <address@hidden>
* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
(defaultLayout): Do kerning.
*
native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
(getKerning): Correct class name, removed unused variable.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java?cvsroot=classpath&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c?cvsroot=classpath&r1=1.1&r2=1.2
Patches:
Index: gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
===================================================================
RCS file:
/sources/classpath/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gnu/java/awt/peer/gtk/FreetypeGlyphVector.java 7 Jun 2006 15:22:50
-0000 1.2
+++ gnu/java/awt/peer/gtk/FreetypeGlyphVector.java 7 Jun 2006 23:48:05
-0000 1.3
@@ -188,6 +188,11 @@
Rectangle2D r = gm.getBounds2D();
glyphTransforms[ i ] = AffineTransform.getTranslateInstance(x, 0);
x += gm.getAdvanceX();
+ if( i > 0 )
+ {
+ Point2D p = getKerning( glyphCodes[ i - 1 ], glyphCodes[ i ] );
+ x += p.getX();
+ }
}
}
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
===================================================================
RCS file:
/sources/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 7 Jun
2006 13:54:32 -0000 1.1
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 7 Jun
2006 23:48:05 -0000 1.2
@@ -115,7 +115,6 @@
font = getFont(env, obj);
ft_face = pango_fc_font_lock_face( font );
g_assert (ft_face != NULL);
-
FT_Get_Kerning( ft_face, rightGlyph, leftGlyph, FT_KERNING_DEFAULT, &kern );
pango_fc_font_unlock_face( font );
@@ -123,7 +122,7 @@
values[0].d = (jdouble)kern.x/64.0;
values[1].d = (jdouble)kern.y/64.0;
- cls = (*env)->FindClass (env, "java/awt/geom/Point2D.Double");
+ cls = (*env)->FindClass (env, "java/awt/geom/Point2D$Double");
method = (*env)->GetMethodID (env, cls, "<init>", "(DD)V");
return (*env)->NewObjectA(env, cls, method, values);
}
@@ -136,7 +135,6 @@
jdouble *values;
jdoubleArray retArray = NULL;
PangoFcFont *font;
- FT_BBox acbox;
font = getFont(env, obj);
ft_face = pango_fc_font_lock_face( font );
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [commit-cp] classpath gnu/java/awt/peer/gtkFreetypeGlyphVec...,
Sven de Marothy <=