Branch: Tag:

1997-12-28

1997-12-28 09:30:05 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

now works better with NT _and_ Unix :)

Rev: src/configure.in:1.144
Rev: src/fd_control.c:1.10
Rev: src/gc.c:1.23
Rev: src/global.h:1.12
Rev: src/main.c:1.28
Rev: src/modules/Image/blit_layer_include.h:1.5
Rev: src/modules/Image/configure.in:1.5
Rev: src/modules/Image/font.c:1.23
Rev: src/modules/files/configure.in:1.36
Rev: src/modules/files/efuns.c:1.41
Rev: src/modules/system/configure.in:1.14
Rev: src/modules/system/system.c:1.33
Rev: src/pike_memory.c:1.3
Rev: src/signal_handler.c:1.16
Rev: src/stralloc.c:1.19
Rev: src/stuff.c:1.3
Rev: src/stuff.h:1.3

1: - /* $Id: blit_layer_include.h,v 1.4 1997/10/27 22:41:17 mirar Exp $ */ + /* $Id: blit_layer_include.h,v 1.5 1997/12/28 09:29:31 hubbe Exp $ */   /* included w/ defines in blit.c, image_add_layer() */      /*   **! module Image   **! note - **! $Id: blit_layer_include.h,v 1.4 1997/10/27 22:41:17 mirar Exp $ + **! $Id: blit_layer_include.h,v 1.5 1997/12/28 09:29:31 hubbe Exp $   **! class image   */   
102: Inside #if undefined(ALL_IS_NOP)
   switch (lr->method)    {    case LAYER_MAX: -  res.r=max(lr->s->r,rgb.r); -  res.g=max(lr->s->g,rgb.g); -  res.b=max(lr->s->b,rgb.b); +  res.r=MAXIMUM(lr->s->r,rgb.r); +  res.g=MAXIMUM(lr->s->g,rgb.g); +  res.b=MAXIMUM(lr->s->b,rgb.b);    break;    case LAYER_MIN: -  res.r=min(lr->s->r,rgb.r); -  res.g=min(lr->s->g,rgb.g); -  res.b=min(lr->s->b,rgb.b); +  res.r=MINIMUM(lr->s->r,rgb.r); +  res.g=MINIMUM(lr->s->g,rgb.g); +  res.b=MINIMUM(lr->s->b,rgb.b);    break;    case LAYER_ADD: -  res.r=(unsigned char)max(255,(lr->s->r+rgb.r)); -  res.g=(unsigned char)max(255,(lr->s->g+rgb.g)); -  res.b=(unsigned char)max(255,(lr->s->b+rgb.b)); +  res.r=(unsigned char)MAXIMUM(255,(lr->s->r+rgb.r)); +  res.g=(unsigned char)MAXIMUM(255,(lr->s->g+rgb.g)); +  res.b=(unsigned char)MAXIMUM(255,(lr->s->b+rgb.b));    break;    case LAYER_MULT:    res.r=(unsigned char)((lr->s->r*rgb.r)*q);