[q-lang-cvs] q/modules/magick magick.c,1.16,1.17 magick.q,1.14,1.15

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

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

Modified Files:
	magick.c magick.q 
Log Message:
fixed VAL arg of threshold operation

Index: magick.c
===================================================================
RCS file: /cvsroot/q-lang/q/modules/magick/magick.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** magick.c	28 Dec 2003 23:28:30 -0000	1.16
--- magick.c	28 Dec 2003 23:36:09 -0000	1.17
***************
*** 1640,1652 ****
  {
    Image *img;
-   double threshold;
    char *val = NULL;
    if (argc == 2 && isobj(argv[0], type(Image), (void**)&img) &&
!       (isstr(argv[1], &val) || ismpz_float(argv[1], &threshold))) {
!     int res;
!     if (val)
!       res = ThresholdImageChannel(img, val);
!     else
!       res = ThresholdImage(img, threshold);
      if (!res)
        return __FAIL;
--- 1640,1647 ----
  {
    Image *img;
    char *val = NULL;
    if (argc == 2 && isobj(argv[0], type(Image), (void**)&img) &&
!       isstr(argv[1], &val)) {
!     int res = ThresholdImageChannel(img, val);
      if (!res)
        return __FAIL;

Index: magick.q
===================================================================
RCS file: /cvsroot/q-lang/q/modules/magick/magick.q,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** magick.q	28 Dec 2003 23:28:30 -0000	1.14
--- magick.q	28 Dec 2003 23:36:09 -0000	1.15
***************
*** 318,325 ****
  public extern negate IMG, normalize IMG;
  
! /* Effects. Note: The VAL argument of the threshold operation can be either a
!    single integer value denoting an absolute threshold in the range 0..0xffff,
!    or a string in the same format as the parameter of ImageMagick's -threshold
!    option, see ImageMagick(1). */
  
  public extern adaptive_threshold IMG DIM OFFS;
--- 318,324 ----
  public extern negate IMG, normalize IMG;
  
! /* Effects. Note: The VAL argument of the threshold operation is a string in
!    the same format as the parameter of ImageMagick's -threshold option, see
!    ImageMagick(1). */
  
  public extern adaptive_threshold IMG DIM OFFS;