[cairo-commit] cairo-java/src/java/org/freedesktop/cairo PdfSurface.java, 1.3, 1.4 FreetypeFont.java, 1.1, 1.2 Cairo.java, 1.2, 1.3 PngSurface.java, 1.2, 1.3

[Jeffrey Morgan]

Committed by: kuzman

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

Modified Files:
	PdfSurface.java FreetypeFont.java Cairo.java PngSurface.java 
Log Message:
Fixed for FreeTypeFont, PngSurface, and javadoc cleanup

Index: PdfSurface.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/PdfSurface.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PdfSurface.java	4 Mar 2005 21:03:38 -0000	1.3
+++ PdfSurface.java	4 Mar 2005 23:01:41 -0000	1.4
@@ -14,8 +14,6 @@
 import org.gnu.glib.Handle;
 
 /**
- * TODO: When / How does the file get closed ?
- * TODO: Is file opened twice ?
  */
 public class PdfSurface extends Surface {
 

Index: FreetypeFont.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/FreetypeFont.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FreetypeFont.java	23 Feb 2005 18:17:52 -0000	1.1
+++ FreetypeFont.java	4 Mar 2005 23:01:41 -0000	1.2
@@ -20,9 +20,10 @@
      * @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) {
-        super(cairo_ft_font_create(family, slant.getValue(), weight.getValue()));
+    public FreetypeFont(String family, FontSlant slant, FontWeight weight, Matrix scale) {
+        super(cairo_ft_font_create(family, slant.getValue(), weight.getValue(), scale.getHandle()));
     }
     
     /**
@@ -32,15 +33,16 @@
      * @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) {
-        super(cairo_ft_font_create(family, slant, weight));
+    public FreetypeFont(String family, String slant, String weight, Matrix scale) {
+        super(cairo_ft_font_create(family, slant, weight, scale.getHandle()));
     }
        
     /*
      * Native methods
      */
-    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);
+    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);
 
 }

Index: Cairo.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Cairo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Cairo.java	4 Mar 2005 20:34:47 -0000	1.2
+++ Cairo.java	4 Mar 2005 23:01:41 -0000	1.3
@@ -97,7 +97,6 @@
 	
 	/**
 	 * Sets a constant color for filling and stroking.
-	 * This replaces any pattern set with {@link #setPattern()}.
 	 * The color components are floating point numbers in the
 	 * range 0 to 1. If the values passed in are outside that range,
 	 * they will be clamped.
@@ -111,7 +110,6 @@
 	
 	/**
 	 * Sets a constant color for filling and stroking.
-	 * This replaces any pattern set with {@link #setPattern()}.
 	 * The color components are floating point numbers in the
 	 * range 0 to 1. If the values passed in are outside that range,
 	 * they will be clamped.
@@ -214,7 +212,6 @@
 	
 	/**
 	 * Scales.
-	 * @param scale
 	 */
 	public void scale(double sx, double sy) {
 		cairo_scale(getHandle(), sx, sy);
@@ -533,8 +530,8 @@
      *            y co-ordinate of the end point
      */
     public void arcTo(double rx, double ry, double xAxisRotation,
-            int largeAarcFlag, int sweepFlag, double end_x, double end_y) {
-        cairo_arc_to(getHandle(), rx, ry, xAxisRotation, largeAarcFlag,
+            int largeArcFlag, int sweepFlag, double end_x, double end_y) {
+        cairo_arc_to(getHandle(), rx, ry, xAxisRotation, largeArcFlag,
         		sweepFlag, end_x, end_y);
     }
 
@@ -678,7 +675,7 @@
     /**
      * Sets the font for drawing text.
      * 
-     * @param name
+     * @param family
      *            Font family name
      * @param slant
      *            Font slant

Index: PngSurface.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/PngSurface.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PngSurface.java	4 Mar 2005 21:03:38 -0000	1.2
+++ PngSurface.java	4 Mar 2005 23:01:41 -0000	1.3
@@ -14,8 +14,6 @@
 import org.gnu.glib.Handle;
 
 /**
- * TODO: When / How does the file get closed ?
- * TODO: Is file opened twice ?
  */
 public class PngSurface extends Surface {