pike.git/ src/ modules/ Image/ dct.c

Branch: Tag:

1999-06-18

1999-06-18 19:19:29 by Mirar (Pontus Hagland) <pike@sort.mirar.org>

autoconverted a lot of 'bad arg' and 'out of memory' type errors

Rev: src/modules/Image/blit.c:1.37
Rev: src/modules/Image/colors.c:1.22
Rev: src/modules/Image/colortable.c:1.71
Rev: src/modules/Image/dct.c:1.14
Rev: src/modules/Image/font.c:1.52
Rev: src/modules/Image/image.c:1.146
Rev: src/modules/Image/matrix.c:1.20
Rev: src/modules/Image/orient.c:1.12
Rev: src/modules/Image/search.c:1.12

1: - /* $Id: dct.c,v 1.13 1999/04/22 12:40:29 mirar Exp $ */ + /* $Id: dct.c,v 1.14 1999/06/18 19:19:20 mirar Exp $ */      /*   **! module Image   **! note - **! $Id: dct.c,v 1.13 1999/04/22 12:40:29 mirar Exp $ + **! $Id: dct.c,v 1.14 1999/06/18 19:19:20 mirar Exp $   **! class Image   */   
78:    double *costbl;    rgb_group *pix;    -  if (!THIS->img) error("no image\n"); +  if (!THIS->img) error("Called Image.Image object is not initialized\n");;       fprintf(stderr,"%lu bytes, %lu bytes\n",    (unsigned long)(sizeof(rgbd_group)*THIS->xsize*THIS->ysize),    (unsigned long)(sizeof(rgb_group)*THIS->xsize*THIS->ysize+1));       if (!(area=malloc(sizeof(rgbd_group)*THIS->xsize*THIS->ysize+1))) -  error("Out of memory\n"); +  resource_error(NULL,0,0,"memory",0,"Out of memory.\n");       if (!(costbl=malloc(sizeof(double)*THIS->xsize+1)))    {    free(area); -  error("Out of memory\n"); +  resource_error(NULL,0,0,"memory",0,"Out of memory.\n");    }       o=clone_object(image_program,0);
104:    img->xsize=MAXIMUM(1,sp[-args].u.integer);    img->ysize=MAXIMUM(1,sp[1-args].u.integer);    } -  else error("Illegal arguments to image->dct()\n"); +  else bad_arg_error("image->dct",sp-args,args,0,"",sp-args, +  "Bad arguments to image->dct()\n");       if (!(img->img=(rgb_group*)malloc(sizeof(rgb_group)*    img->xsize*img->ysize+1)))
112:    free(area);    free(costbl);    free_object(o); -  error("Out of memory\n"); +  resource_error(NULL,0,0,"memory",0,"Out of memory.\n");    }       xsz2=THIS->xsize*2.0;