[cairo-commit] CairoJava/src/org/cairographics/cairo/internal CairoAPI.java,1.4,1.5

[Soorya Kuloor]

Committed by: skuloor

Update of /cvs/cairo/CairoJava/src/org/cairographics/cairo/internal
In directory pdx:/tmp/cvs-serv11975/src/org/cairographics/cairo/internal

Modified Files:
	CairoAPI.java 
Log Message:
Port to latest Cairo CVS.

Index: CairoAPI.java
===================================================================
RCS file: /cvs/cairo/CairoJava/src/org/cairographics/cairo/internal/CairoAPI.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CairoAPI.java	17 Nov 2003 17:46:50 -0000	1.4
--- CairoAPI.java	23 Dec 2003 17:36:01 -0000	1.5
***************
*** 74,77 ****
--- 74,78 ----
      public static native void rotate(long xrs, double angle);
      public static native void setMatrix(long xrs, long matrix);
+     public static native void getMatrix(long xrs, long matrix);
      public static native void concatMatrix(long xrs, long matrix);
      public static native double[] transformPoint(long xrs, double x, double y);
***************
*** 207,222 ****
       *
       */
!     public static native void selectFont(long xrs, String key);
      public static native void scaleFont(long xrs, double scale);
!     public static native void transformFont(
!         long xrs,
!         double a,
!         double b,
!         double c,
!         double d);
!     //XXX: NYI 14.11.2003
!     //public static native double[] getTextExtents(long xrs, String str);
      public static native void showText(long xrs, String text);
  
      public static native void showSurface(
          long xrs,
--- 208,226 ----
       *
       */
!     public static native void selectFont(long xrs, String familyName, short slant, short weight);
!     public static native void setFont(long xrs, long fontHandle);
!     public static native long getCurrentFont(long xrs);
!     
      public static native void scaleFont(long xrs, double scale);
!     public static native void transformFont(long xrs, long matrix);
!     public static native double[] getTextExtents(long xrs, String str);
      public static native void showText(long xrs, String text);
  
+     public static native long ftFontCreate(String family, short slant, short weight);
+     public static native long ftFontCreate(String family, String slant, String weight);
+     public static native void fontSetTransform(long fontHandle, long matrix);
+     public static native void fontRef(long fontHandle);
+     public static native void destroyFont(long fontHandle);
+ 
      public static native void showSurface(
          long xrs,
***************
*** 237,242 ****
       *
       */
!     //XXX: NYI 14.11.2003
!    // public static native long surfaceCreateForPixmap(long pixmap);
      public static native long surfaceCreateForDrawable(long drawable);
      public static native long surfaceCreateSimilar(
--- 241,245 ----
       *
       */
!     public static native long surfaceCreateForPixmap(long pixmap);
      public static native long surfaceCreateForDrawable(long drawable);
      public static native long surfaceCreateSimilar(
***************
*** 246,265 ****
          int height);
  
-     /*
-      *XXX NYI 14.11.2003 
-      *
-     public static native long surfaceCreateSimilarSolid(
-         long neighbor,
-         short format,
-         int width,
-         int height,
-         double red,
-         double green,
-         double blue,
-         double alpha);
-         */
      public static native void surfaceDestroy(long surface);
      public static native short surfaceSetRepeat(long surface, int repeat);
! 
      /*
       * Query functions
--- 249,260 ----
          int height);
  
      public static native void surfaceDestroy(long surface);
      public static native short surfaceSetRepeat(long surface, int repeat);
!     
!     /*
!      * NYI
!     public static native void surfaceClipRectangle(long surface, int x, int y, int width, int height);
!     */
!     
      /*
       * Query functions