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

2004-05-19

2004-05-19 00:10:11 by Martin Nilsson <mani@lysator.liu.se>

• 7d60af0ee0b776107323302bf37915ef384f7a21 (20 lines) (+13/-7) ^{[ Show | Annotate ]}
  Branch: 7.9

Some malloc fixes

Rev: src/modules/Image/blit.c:1.57
Rev: src/modules/Image/colortable.c:1.120
Rev: src/modules/Image/dct.c:1.27
Rev: src/modules/Image/encodings/atari.c:1.4
Rev: src/modules/Image/encodings/atari.h:1.4
Rev: src/modules/Image/encodings/neo.c:1.10
Rev: src/modules/Image/encodings/pcx.c:1.22
Rev: src/modules/Image/encodings/png.c:1.64
Rev: src/modules/Image/encodings/tga.c:1.36
Rev: src/modules/Image/encodings/wbf.c:1.16
Rev: src/modules/Image/encodings/x.c:1.46
Rev: src/modules/Image/encodings/xcf.c:1.49
Rev: src/modules/Image/font.c:1.84
Rev: src/modules/Image/image.c:1.215
Rev: src/modules/Image/matrix.c:1.49
Rev: src/modules/Image/pattern.c:1.30
Rev: src/modules/Image/polyfill.c:1.49
Rev: src/modules/Image/search.c:1.29

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: dct.c,v 1.26 2004/05/02 23:07:59 nilsson Exp $ + || $Id: dct.c,v 1.27 2004/05/19 00:10:10 nilsson Exp $   */      /*
79:    double *costbl;    rgb_group *pix;    -  if (!THIS->img) Pike_error("Called Image.Image object is not initialized\n");; +  if (!THIS->img) +  Pike_error("Called Image.Image object is not initialized\n");      #ifdef DCT_DEBUG    fprintf(stderr,"%lu bytes, %lu bytes\n",
87:    DO_NOT_WARN((unsigned long)(sizeof(rgb_group)*THIS->xsize*THIS->ysize+1)));   #endif    -  if (!(area=malloc(sizeof(rgbd_group)*THIS->xsize*THIS->ysize+1))) -  resource_error(NULL,0,0,"memory",0,"Out of memory.\n"); +  area=xalloc(sizeof(rgbd_group)*THIS->xsize*THIS->ysize+1);       if (!(costbl=malloc(sizeof(double)*THIS->xsize+1)))    {
107:    img->xsize=MAXIMUM(1,sp[-args].u.integer);    img->ysize=MAXIMUM(1,sp[1-args].u.integer);    } -  else bad_arg_error("image->dct",sp-args,args,0,"",sp-args, +  else { +  free(area); +  free(costbl); +  free_object(o); +  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)))