[cairo-commit] cairo-ocaml/src ocairo.ml,1.1.1.1,1.2 ocairo.mli,1.1.1.1,1.2 cairo.ml,1.1.1.1,1.2 cairo.mli,1.1.1.1,1.2

[Olivier Andrieu]

Committed by: oandrieu

Update of /cvs/cairo/cairo-ocaml/src
In directory pdx:/tmp/cvs-serv17279

Modified Files:
	ocairo.ml ocairo.mli cairo.ml cairo.mli 
Log Message:
add Cairo.move_to_point and changed field names for Cairo.glyph

Index: ocairo.ml
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/src/ocairo.ml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ocairo.ml	18 Nov 2003 19:02:26 -0000	1.1.1.1
--- ocairo.ml	18 Nov 2003 19:15:49 -0000	1.2
***************
*** 31,35 ****
  type line_join = Cairo.line_join = LINE_JOIN_MITER | LINE_JOIN_ROUND | LINE_JOIN_BEVEL
  
! type glyph = Cairo.glyph = { index : int; x : float; y : float; }
  type font_extents = Cairo.font_extents = {
    ascent : float;
--- 31,35 ----
  type line_join = Cairo.line_join = LINE_JOIN_MITER | LINE_JOIN_ROUND | LINE_JOIN_BEVEL
  
! type glyph = Cairo.glyph = { index : int; glyph_x : float; glyph_y : float; }
  type font_extents = Cairo.font_extents = {
    ascent : float;
***************
*** 119,122 ****
--- 119,123 ----
      method new_path = Cairo.new_path c
      method move_to x y = Cairo.move_to c x y
+     method move_to_point p = Cairo.move_to_point c p
      method line_to x y = Cairo.line_to c x y
      method curve_to x1 y1 x2 y2 x3 y3 = Cairo.curve_to c x1 y1 x2 y2 x3 y3

Index: ocairo.mli
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/src/ocairo.mli,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ocairo.mli	18 Nov 2003 19:02:26 -0000	1.1.1.1
--- ocairo.mli	18 Nov 2003 19:15:49 -0000	1.2
***************
*** 36,40 ****
    | LINE_JOIN_ROUND
    | LINE_JOIN_BEVEL
! type glyph = Cairo.glyph = { index : int; x : float; y : float; }
  type font_extents =
    Cairo.font_extents = {
--- 36,40 ----
    | LINE_JOIN_ROUND
    | LINE_JOIN_BEVEL
! type glyph = Cairo.glyph = { index : int; glyph_x : float; glyph_y : float; }
  type font_extents =
    Cairo.font_extents = {
***************
*** 95,98 ****
--- 95,99 ----
      method miter_limit : float
      method move_to : float -> float -> unit
+     method move_to_point : point -> unit
      method new_path : unit
      method operator : Cairo.operator

Index: cairo.ml
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/src/cairo.ml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** cairo.ml	18 Nov 2003 19:02:26 -0000	1.1.1.1
--- cairo.ml	18 Nov 2003 19:15:49 -0000	1.2
***************
*** 99,102 ****
--- 99,103 ----
  external new_path : cr:t -> unit = "ml_cairo_new_path"
  external move_to : cr:t -> x:float -> y:float -> unit = "ml_cairo_move_to"
+ let move_to_point ~cr { x = x ; y = y } = move_to ~cr ~x ~y
  external line_to : cr:t -> x:float -> y:float -> unit = "ml_cairo_line_to"
  external curve_to :
***************
*** 128,132 ****
  external clip : cr:t -> unit = "ml_cairo_clip"
  type font
! type glyph = { index : int; x : float; y : float }
  type font_extents =
    { ascent : float;
--- 129,133 ----
  external clip : cr:t -> unit = "ml_cairo_clip"
  type font
! type glyph = { index : int; glyph_x : float; glyph_y : float; }
  type font_extents =
    { ascent : float;

Index: cairo.mli
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/src/cairo.mli,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** cairo.mli	18 Nov 2003 19:02:26 -0000	1.1.1.1
--- cairo.mli	18 Nov 2003 19:15:49 -0000	1.2
***************
*** 111,114 ****
--- 111,115 ----
  external new_path : cr:t -> unit = "ml_cairo_new_path"
  external move_to : cr:t -> x:float -> y:float -> unit = "ml_cairo_move_to"
+ val move_to_point : cr:t -> point -> unit
  external line_to : cr:t -> x:float -> y:float -> unit = "ml_cairo_line_to"
  external curve_to :
***************
*** 158,162 ****
  
  type font
! type glyph = { index : int; x : float; y : float; }
  type font_extents = {
    ascent : float;
--- 159,163 ----
  
  type font
! type glyph = { index : int; glyph_x : float; glyph_y : float; }
  type font_extents = {
    ascent : float;