Branch: Tag:

1999-06-24

1999-06-24 23:15:21 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

removed a warning

Rev: src/modules/Image/encodings/xcf.c:1.10

1:   #include "global.h" - RCSID("$Id: xcf.c,v 1.9 1999/05/30 20:12:21 mirar Exp $"); + RCSID("$Id: xcf.c,v 1.10 1999/06/24 23:15:21 hubbe Exp $");      #include "image_machine.h"   
36:   #define TILE_WIDTH 64   #define TILE_HEIGHT 64    - #define MIN(X,Y) ((X)<(Y)?(X):(Y)) +    #define STRING(X) static struct pike_string *s_##X;   #include "xcf_constant_strings.h"   #undef STRING
387:    else if(offset2)    ob.len = offset2-offset;    else -  ob.len = MIN((TILE_WIDTH*TILE_HEIGHT*5),ob.len); +  ob.len = MINIMUM((TILE_WIDTH*TILE_HEIGHT*5),ob.len);    tile->data = ob;    tile->next = NULL;   /* fprintf(stderr, "tile, o=%d; o2=%d; l=%d\n", offset, offset2,ob.len); */
1134:    struct pike_string *tile = tiles->item[l].u.string;    unsigned int eheight, ewidth;    unsigned char *s; -  ewidth = MIN(TILE_WIDTH, i->xsize-x); -  eheight = MIN(TILE_HEIGHT, i->ysize-y); +  ewidth = MINIMUM(TILE_WIDTH, i->xsize-x); +  eheight = MINIMUM(TILE_HEIGHT, i->ysize-y);    tile->refs++;      /* fprintf(stderr, " tile %d/%d [%dx%d] %dbpp \n", */