Branch: Tag:

2000-08-11

2000-08-11 19:11:42 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Fixed a few warnings.

Rev: src/modules/Image/blit.c:1.46
Rev: src/modules/Image/colortable.c:1.90
Rev: src/modules/Image/colortable.h:1.22
Rev: src/modules/Image/colortable_lookup.h:1.12
Rev: src/modules/Image/encodings/gif.c:1.56
Rev: src/modules/Image/encodings/iff.c:1.8
Rev: src/modules/Image/encodings/ilbm.c:1.18
Rev: src/modules/Image/encodings/png.c:1.37
Rev: src/modules/Image/encodings/psd.c:1.22
Rev: src/modules/Image/encodings/ras.c:1.10
Rev: src/modules/Image/encodings/x.c:1.30
Rev: src/modules/Image/font.c:1.62
Rev: src/modules/Image/matrix.c:1.28
Rev: src/modules/Image/pattern.c:1.22

1: - /* $Id: blit.c,v 1.45 2000/08/10 09:51:53 per Exp $ */ + /* $Id: blit.c,v 1.46 2000/08/11 18:46:35 grubba Exp $ */   #include "global.h"      /*   **! module Image   **! note - **! $Id: blit.c,v 1.45 2000/08/10 09:51:53 per Exp $ + **! $Id: blit.c,v 1.46 2000/08/11 18:46:35 grubba Exp $   **! class Image   */   
417:    for (ix=0; ix<mx; ix++)    {    x = ix + x1; y = iy + y1; -  if(x>=0 && y>=0 && x<xs && y<ys) +  if(x>=0 && y>=0 && x<xs && y<ys) {    if(this->alpha)    set_rgb_group_alpha(this->img[x+y*xs],*(source),this->alpha);    else    this->img[x+y*xs]=*(source); -  +  }    source++;    }    THREADS_DISALLOW();
510:    {    if (m->r==255) d->r=s->r;    else if (m->r==0) {} -  else d->r=(unsigned char)(((d->r*(255-m->r))+(s->r*m->r))*q); +  else d->r = DOUBLE_TO_COLORTYPE(((d->r*(255-m->r))+(s->r*m->r))*q);    if (m->g==255) d->g=s->g;    else if (m->g==0) {} -  else d->g=(unsigned char)(((d->g*(255-m->g))+(s->g*m->g))*q); +  else d->g = DOUBLE_TO_COLORTYPE(((d->g*(255-m->g))+(s->g*m->g))*q);    if (m->b==255) d->b=s->b;    else if (m->b==0) {} -  else d->b=(unsigned char)(((d->b*(255-m->b))+(s->b*m->b))*q); +  else d->b = DOUBLE_TO_COLORTYPE(((d->b*(255-m->b))+(s->b*m->b))*q);    s++; m++; d++;    }    s+=smod; m+=mmod; d+=dmod;
612:    {    if (m->r==255) d->r=rgb.r;    else if (m->r==0) ; -  else d->r=(unsigned char)(((d->r*(255-m->r))+(rgb.r*m->r))*q); +  else d->r = DOUBLE_TO_COLORTYPE(((d->r*(255-m->r))+(rgb.r*m->r))*q);    if (m->g==255) d->g=rgb.g;    else if (m->g==0) ; -  else d->g=(unsigned char)(((d->g*(255-m->g))+(rgb.g*m->g))*q); +  else d->g = DOUBLE_TO_COLORTYPE(((d->g*(255-m->g))+(rgb.g*m->g))*q);    if (m->b==255) d->b=rgb.b;    else if (m->b==0) ; -  else d->b=(unsigned char)(((d->b*(255-m->b))+(rgb.b*m->b))*q); +  else d->b = DOUBLE_TO_COLORTYPE(((d->b*(255-m->b))+(rgb.b*m->b))*q);    m++; d++;    }    m+=mmod; d+=dmod;