FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FreetypeGlyphVector.java (getKerning): Return result in a float[], not a Point2D.

Browse source 
2008-11-05  Andrew Haley  <aph@redhat.com>

        * gnu/java/awt/peer/gtk/FreetypeGlyphVector.java (getKerning):
        Return result in a float[], not a Point2D.
        (performDefaultLayout): Call getKerning with a float[].
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
        (getKerning): Return result in a float[], not a Point2D.

From-SVN: r141610
This commit is contained in:
Andrew Haley 2008-11-05 14:19:06 +00:00 • committed by Andrew Haley
parent f158188388
commit 57d891b40a
5 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libjava/classpath/gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
View file

@ -247,7 +247,8 @@ public class FreetypeGlyphVector extends GlyphVector
/**
* Returns the kerning of a glyph pair
*/
private native Point2D getKerning(int leftGlyph, int rightGlyph, long font);
private native void getKerning(int leftGlyph, int rightGlyph, long font,
float[] p);
private native double[] getMetricsNative(int glyphCode, long font);
@ -301,6 +302,7 @@ public class FreetypeGlyphVector extends GlyphVector
GlyphMetrics gm = null;
float x = 0;
float y = 0;
float[] p = {0.0f, 0.0f};
for(int i = 0; i < nGlyphs; i++)
{
gm = getGlyphMetrics( i );
@ -314,9 +316,9 @@ public class FreetypeGlyphVector extends GlyphVector
// using the same font
if (i != nGlyphs-1 && fontSet[i] == fontSet[i+1])
{
Point2D p = getKerning(glyphCodes[i], glyphCodes[i + 1], fontSet[i]);
x += p.getX();
y += p.getY();
getKerning(glyphCodes[i], glyphCodes[i + 1], fontSet[i], p);
x += p[0];
y += p[1];
}
}
glyphPositions[nGlyphs * 2] = x;