[cairo-commit] cairo-java/src/java/org/freedesktop/cairo FreetypeFont.java, 1.4, 1.5

[Jeffrey Morgan]

Committed by: kuzman

Update of /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo
In directory gabe:/tmp/cvs-serv11371/src/java/org/freedesktop/cairo

Modified Files:
	FreetypeFont.java 
Log Message:
updated API to match upstream changes.

Index: FreetypeFont.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/FreetypeFont.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- FreetypeFont.java	11 Apr 2005 00:47:21 -0000	1.4
+++ FreetypeFont.java	23 Apr 2005 19:49:46 -0000	1.5
@@ -20,10 +20,9 @@
      * @param family The font family
      * @param slant Font slant
      * @param weight Font weight
-     * @param scale Font scale
      */
-    public FreetypeFont(String family, FontSlant slant, FontWeight weight, Matrix scale) {
-        super(cairo_ft_font_create(family, slant.getValue(), weight.getValue(), scale.getHandle()));
+    public FreetypeFont(String family, FontSlant slant, FontWeight weight) {
+        super(cairo_ft_font_create(family, slant.getValue(), weight.getValue()));
     }
     
     /**
@@ -33,16 +32,15 @@
      * @param family The font family
      * @param slant Font slant, such as italic, normal, oblique.
      * @param weight Font weight, such as bold, normal, narrow.
-     * @param scale Font scale
      */
-    public FreetypeFont(String family, String slant, String weight, Matrix scale) {
-        super(cairo_ft_font_create(family, slant, weight, scale.getHandle()));
+    public FreetypeFont(String family, String slant, String weight) {
+        super(cairo_ft_font_create(family, slant, weight));
     }
        
     /*
      * Native methods
      */
-    native static Handle cairo_ft_font_create (String family, int slant, int weight, Handle scale);
-    native static Handle cairo_ft_font_create (String family, String slant, String weight, Handle scale);
+    native static Handle cairo_ft_font_create (String family, int slant, int weight);
+    native static Handle cairo_ft_font_create (String family, String slant, String weight);
 
 }