[q-lang-cvs] q/modules/magick magick.c,1.22,1.23 magick.q,1.20,1.21

[<ag...@us...>]

Update of /cvsroot/q-lang/q/modules/magick
In directory sc8-pr-cvs1:/tmp/cvs-serv15493

Modified Files:
	magick.c magick.q 
Log Message:
fixed frame operation (missing P parameter)

Index: magick.c
===================================================================
RCS file: /cvsroot/q-lang/q/modules/magick/magick.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** magick.c	29 Dec 2003 12:31:42 -0000	1.22
--- magick.c	29 Dec 2003 13:08:32 -0000	1.23
***************
*** 2020,2032 ****
    int n;
    expr *xv;
    unsigned long w, h;
    long inner, outer;
!   if (argc == 3 && isobj(argv[0], type(Image), (void**)&img) &&
        istuple(argv[1], &n, &xv) && n == 2 &&
!       isuint(xv[0], &w) && isuint(xv[1], &h) &&
        istuple(argv[2], &n, &xv) && n == 2 &&
        isint(xv[0], &inner) && isint(xv[1], &outer)) {
      FrameInfo frame;
!     frame.x = frame.y = 0; frame.width = w; frame.height = h;
      frame.inner_bevel = inner; frame.outer_bevel = outer;
      img = FrameImage(img, &frame, &exception);
--- 2020,2035 ----
    int n;
    expr *xv;
+   long x, y;
    unsigned long w, h;
    long inner, outer;
!   if (argc == 4 && isobj(argv[0], type(Image), (void**)&img) &&
        istuple(argv[1], &n, &xv) && n == 2 &&
!       isint(xv[0], &x) && isint(xv[1], &y) &&
        istuple(argv[2], &n, &xv) && n == 2 &&
+       isuint(xv[0], &w) && isuint(xv[1], &h) &&
+       istuple(argv[3], &n, &xv) && n == 2 &&
        isint(xv[0], &inner) && isint(xv[1], &outer)) {
      FrameInfo frame;
!     frame.x = x; frame.y = y; frame.width = w; frame.height = h;
      frame.inner_bevel = inner; frame.outer_bevel = outer;
      img = FrameImage(img, &frame, &exception);

Index: magick.q
===================================================================
RCS file: /cvsroot/q-lang/q/modules/magick/magick.q,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** magick.q	29 Dec 2003 12:31:42 -0000	1.20
--- magick.q	29 Dec 2003 13:08:32 -0000	1.21
***************
*** 389,393 ****
  
  public extern border IMG DIM;
! public extern frame IMG DIM BEVEL;
  public extern button IMG DIM RAISE;				// BANG!
  
--- 389,393 ----
  
  public extern border IMG DIM;
! public extern frame IMG P DIM BEVEL;
  public extern button IMG DIM RAISE;				// BANG!