diff --git a/src/modules/Image/blit.c b/src/modules/Image/blit.c
index 5fe16b7918632791ed85fbe7f0f83481b791f175..1d6db74bcea6b8910478281a8f3a9eb730f4823c 100644
--- a/src/modules/Image/blit.c
+++ b/src/modules/Image/blit.c
@@ -1,10 +1,10 @@
-/* $Id: blit.c,v 1.28 1998/04/20 18:53:27 grubba Exp $ */
+/* $Id: blit.c,v 1.29 1998/04/24 13:46:04 mirar Exp $ */
#include "global.h"
/*
**! module Image
**! note
-**! $Id: blit.c,v 1.28 1998/04/20 18:53:27 grubba Exp $
+**! $Id: blit.c,v 1.29 1998/04/24 13:46:04 mirar Exp $
**! class image
*/
@@ -91,12 +91,12 @@ static INLINE void getrgb(struct image *img,
img->rgb.r=(unsigned char)sp[-args+args_start].u.integer;
img->rgb.g=(unsigned char)sp[1-args+args_start].u.integer;
img->rgb.b=(unsigned char)sp[2-args+args_start].u.integer;
- if (args-args_start>=4) {
+ if (args-args_start>=4)
if (sp[3-args+args_start].type!=T_INT)
error("Illegal alpha argument to %s\n",name);
else
img->alpha=sp[3-args+args_start].u.integer;
- } else
+ else
img->alpha=0;
}
@@ -390,12 +390,11 @@ void image_paste_alpha(INT32 args)
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();
diff --git a/src/modules/Image/colortable.c b/src/modules/Image/colortable.c
index e498ce56b89e172cf2be39444fc1a4db7bb52674..52d9224f0039cfb874ca553a39a0d456820d0561 100644
--- a/src/modules/Image/colortable.c
+++ b/src/modules/Image/colortable.c
@@ -1,12 +1,12 @@
#include "global.h"
#include <config.h>
-/* $Id: colortable.c,v 1.44 1998/04/20 18:53:28 grubba Exp $ */
+/* $Id: colortable.c,v 1.45 1998/04/24 13:50:22 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: colortable.c,v 1.44 1998/04/20 18:53:28 grubba Exp $
+**! $Id: colortable.c,v 1.45 1998/04/24 13:50:22 mirar Exp $
**! class colortable
**!
**! This object keeps colortable information,
@@ -21,7 +21,7 @@
#undef COLORTABLE_DEBUG
#undef COLORTABLE_REDUCE_DEBUG
-RCSID("$Id: colortable.c,v 1.44 1998/04/20 18:53:28 grubba Exp $");
+RCSID("$Id: colortable.c,v 1.45 1998/04/24 13:50:22 mirar Exp $");
#include <math.h> /* fabs() */
@@ -2169,11 +2169,13 @@ void image_colortable_reduce(INT32 args)
int numcolors;
if (args)
- if (sp[-args].type!=T_INT) {
+ if (sp[-args].type!=T_INT)
+ {
error("Illegal argument to Image.colortable->reduce\n");
/* Not reached, but keeps the compiler happy. */
numcolors = 0;
- } else
+ }
+ else
numcolors=sp[-args].u.integer;
else
numcolors=1293791; /* a lot */
@@ -3739,13 +3741,16 @@ void image_colortable_ordered(INT32 args)
if (args>=3)
if (sp[-args].type!=T_INT||
sp[1-args].type!=T_INT||
- sp[2-args].type!=T_INT) {
+ sp[2-args].type!=T_INT)
+ {
error("Image.colortable->ordered(): illegal argument(s)\n");
/* Not reached, but keep the compiler happy */
r = 0;
g = 0;
b = 0;
- } else {
+ }
+ else
+ {
r=sp[-args].u.integer;
g=sp[1-args].u.integer;
b=sp[2-args].u.integer;
diff --git a/src/modules/Image/font.c b/src/modules/Image/font.c
index e12e0a50790353b0d73a3bd2608c716748208e8e..0e26f79a98a1bc3497fae1db6f980fbc935698cf 100644
--- a/src/modules/Image/font.c
+++ b/src/modules/Image/font.c
@@ -1,4 +1,4 @@
-/* $Id: font.c,v 1.34 1998/04/20 18:53:29 grubba Exp $ */
+/* $Id: font.c,v 1.35 1998/04/24 13:50:21 mirar Exp $ */
#include "global.h"
#include <config.h>
@@ -7,7 +7,7 @@
/*
**! module Image
**! note
-**! $Id: font.c,v 1.34 1998/04/20 18:53:29 grubba Exp $
+**! $Id: font.c,v 1.35 1998/04/24 13:50:21 mirar Exp $
**! class font
**!
**! note
@@ -284,9 +284,8 @@ static INLINE long file_size(int fd)
struct stat tmp;
int res;
if((!fd_fstat(fd, &tmp)) &&
- (tmp.st_mode & S_IFREG)) {
- return res = tmp.st_size;
- }
+ (tmp.st_mode & S_IFREG))
+ return res = tmp.st_size;
return -1;
}
@@ -306,12 +305,11 @@ static INLINE void write_char(struct _char *ci,
for (x=(INT32)ci->width; x>0; x--)
{
int r,c;
- if((c=255-*p)) {
+ if((c=255-*p))
if ((r=pos->r+c)>255)
pos->r=pos->g=pos->b=255;
else
pos->r=pos->g=pos->b=r;
- }
pos++;
p++;
}
@@ -372,7 +370,8 @@ void font_load(INT32 args)
#ifdef FONT_DEBUG
fprintf(stderr,"FONT Malloced %p (%d)\n",new_font->mem,size);
#endif
- if ((new_font->mem) && (!my_read(fd,new_font->mem,size))) {
+ if ((new_font->mem) && (!my_read(fd,new_font->mem,size)))
+ {
free(new_font->mem);
new_font->mem = NULL;
}
diff --git a/src/modules/Image/matrix.c b/src/modules/Image/matrix.c
index aa3030841813ef9834635e70a4365b6403c62584..de3fb05203a756884a72a5d4d8b6aed3f2b8cdf5 100644
--- a/src/modules/Image/matrix.c
+++ b/src/modules/Image/matrix.c
@@ -1,9 +1,9 @@
-/* $Id: matrix.c,v 1.16 1998/04/16 01:22:59 mirar Exp $ */
+/* $Id: matrix.c,v 1.17 1998/04/24 13:51:00 mirar Exp $ */
/*
**! module Image
**! note
-**! $Id: matrix.c,v 1.16 1998/04/16 01:22:59 mirar Exp $
+**! $Id: matrix.c,v 1.17 1998/04/24 13:51:00 mirar Exp $
**! class image
*/
@@ -89,12 +89,12 @@ static INLINE int getrgb(struct image *img,
img->rgb.r=(unsigned char)sp[-args+args_start].u.integer;
img->rgb.g=(unsigned char)sp[1-args+args_start].u.integer;
img->rgb.b=(unsigned char)sp[2-args+args_start].u.integer;
- if (args-args_start>=4) {
+ if (args-args_start>=4)
if (sp[3-args+args_start].type!=T_INT)
error("Illegal alpha argument to %s\n",name);
else
img->alpha=sp[3-args+args_start].u.integer;
- } else
+ else
img->alpha=0;
return 1;
}
@@ -203,13 +203,15 @@ CHRONO("scale begin");
}
dest->img=d=malloc(newx*newy*sizeof(rgb_group) +1);
- if (d) {
+ if (d)
+ {
CHRONO("transfer begin");
s=new;
y=newx*newy;
- while (y--) {
+ while (y--)
+ {
d->r=MINIMUM((int)(s->r+0.5),255);
d->g=MINIMUM((int)(s->g+0.5),255);
d->b=MINIMUM((int)(s->b+0.5),255);
@@ -224,9 +226,8 @@ CHRONO("transfer begin");
CHRONO("scale end");
THREADS_DISALLOW();
- if (!d) {
- error("Out of memory!\n");
- }
+ if (!d)
+ error("Out of memory!\n");
}
/* Special, faster, case for scale=1/2 */
@@ -249,23 +250,24 @@ void img_scale2(struct image *dest, struct image *source)
dest->xsize=newx;
dest->ysize=newy;
for (y = 0; y < newy; y++)
- for (x = 0; x < newx; x++) {
- pixel(dest,x,y).r = (COLORTYPE)
- (((INT32) pixel(source,2*x+0,2*y+0).r+
- (INT32) pixel(source,2*x+1,2*y+0).r+
- (INT32) pixel(source,2*x+0,2*y+1).r+
- (INT32) pixel(source,2*x+1,2*y+1).r) >> 2);
- pixel(dest,x,y).g = (COLORTYPE)
- (((INT32) pixel(source,2*x+0,2*y+0).g+
- (INT32) pixel(source,2*x+1,2*y+0).g+
- (INT32) pixel(source,2*x+0,2*y+1).g+
- (INT32) pixel(source,2*x+1,2*y+1).g) >> 2);
- pixel(dest,x,y).b = (COLORTYPE)
- (((INT32) pixel(source,2*x+0,2*y+0).b+
- (INT32) pixel(source,2*x+1,2*y+0).b+
- (INT32) pixel(source,2*x+0,2*y+1).b+
- (INT32) pixel(source,2*x+1,2*y+1).b) >> 2);
- }
+ for (x = 0; x < newx; x++)
+ {
+ pixel(dest,x,y).r = (COLORTYPE)
+ (((INT32) pixel(source,2*x+0,2*y+0).r+
+ (INT32) pixel(source,2*x+1,2*y+0).r+
+ (INT32) pixel(source,2*x+0,2*y+1).r+
+ (INT32) pixel(source,2*x+1,2*y+1).r) >> 2);
+ pixel(dest,x,y).g = (COLORTYPE)
+ (((INT32) pixel(source,2*x+0,2*y+0).g+
+ (INT32) pixel(source,2*x+1,2*y+0).g+
+ (INT32) pixel(source,2*x+0,2*y+1).g+
+ (INT32) pixel(source,2*x+1,2*y+1).g) >> 2);
+ pixel(dest,x,y).b = (COLORTYPE)
+ (((INT32) pixel(source,2*x+0,2*y+0).b+
+ (INT32) pixel(source,2*x+1,2*y+0).b+
+ (INT32) pixel(source,2*x+0,2*y+1).b+
+ (INT32) pixel(source,2*x+1,2*y+1).b) >> 2);
+ }
THREADS_DISALLOW();
}
@@ -307,14 +309,13 @@ void image_scale(INT32 args)
o=clone_object(image_program,0);
newimg=(struct image*)(o->storage);
- if (args==1 && sp[-args].type==T_FLOAT) {
- if (sp[-args].u.float_number == 0.5)
- img_scale2(newimg,THIS);
- else
- img_scale(newimg,THIS,
- (INT32)(THIS->xsize*sp[-args].u.float_number),
- (INT32)(THIS->ysize*sp[-args].u.float_number));
- }
+ if (args==1 && sp[-args].type==T_FLOAT)
+ if (sp[-args].u.float_number == 0.5)
+ img_scale2(newimg,THIS);
+ else
+ img_scale(newimg,THIS,
+ (INT32)(THIS->xsize*sp[-args].u.float_number),
+ (INT32)(THIS->ysize*sp[-args].u.float_number));
else if (args>=2 &&
sp[-args].type==T_INT && sp[-args].u.integer==0 &&
sp[1-args].type==T_INT)
diff --git a/src/modules/Image/polyfill.c b/src/modules/Image/polyfill.c
index deabe78fc5e0915327b9bd59e477cc1031338693..b38857a168d37d002bc36c56947aae1eeda7ccac 100644
--- a/src/modules/Image/polyfill.c
+++ b/src/modules/Image/polyfill.c
@@ -1,5 +1,5 @@
#include "global.h"
-RCSID("$Id: polyfill.c,v 1.25 1998/04/20 18:53:33 grubba Exp $");
+RCSID("$Id: polyfill.c,v 1.26 1998/04/24 13:50:19 mirar Exp $");
/* Prototypes are needed for these */
extern double floor(double);
@@ -32,7 +32,7 @@ extern double floor(double);
/*
**! module Image
**! note
-**! $Id: polyfill.c,v 1.25 1998/04/20 18:53:33 grubba Exp $
+**! $Id: polyfill.c,v 1.26 1998/04/24 13:50:19 mirar Exp $
**! class image
*/
@@ -76,7 +76,7 @@ struct vertex
#define VY(V,X) ((V)->above->y+(V)->dy*((X)-(V)->above->x))
-struct vertex *vertex_new(float x,float y,struct vertex **top)
+static struct vertex *vertex_new(float x,float y,struct vertex **top)
{
struct vertex *c;
while (*top && (*top)->y<y) top=&((*top)->next);
@@ -130,17 +130,17 @@ static void vertex_connect(struct vertex *above,
static INLINE float line_xmax(struct line_list *v,float yp,float *ydest)
{
- if (v->dx>0.0) {
+ if (v->dx>0.0)
if (v->below->y>yp+1.0+1e-10)
return v->above->x+v->dx*((*ydest=(yp+1.0))-v->above->y);
else
return (*ydest=v->below->y),v->below->x;
- } else if (v->dx<0.0) {
+ else if (v->dx<0.0)
if (v->above->y<yp-1e-10)
return v->above->x+v->dx*((*ydest=yp)-v->above->y);
else
return (*ydest=v->above->y),v->above->x;
- } else if (v->below->y>yp+1.0+1e-10)
+ else if (v->below->y>yp+1.0+1e-10)
return (*ydest=yp+1.0),v->above->x;
else
return (*ydest=v->below->y),v->below->x;
@@ -148,17 +148,17 @@ static INLINE float line_xmax(struct line_list *v,float yp,float *ydest)
static INLINE float line_xmin(struct line_list *v,float yp,float *ydest)
{
- if (v->dx<0.0) {
+ if (v->dx<0.0)
if (v->below->y>yp+1.0+1e-10)
return v->above->x+v->dx*((*ydest=(yp+1.0))-v->above->y);
else
return (*ydest=v->below->y),v->below->x;
- } else if (v->dx>0.0) {
+ else if (v->dx>0.0)
if (v->above->y<yp-1e-10)
return v->above->x+v->dx*((*ydest=yp)-v->above->y);
else
return (*ydest=v->above->y),v->above->x;
- } else if (v->above->y<yp-1e-10)
+ else if (v->above->y<yp-1e-10)
return (*ydest=yp),v->above->x;
else
return (*ydest=v->above->y),v->above->x;
diff --git a/src/modules/Image/testsuite.in b/src/modules/Image/testsuite.in
index 938905060f3c99932040ae58837b9b3fe8aed7a6..2ef7264c6c3d34e58de2b5eaa7e4964c0157fa9f 100644
--- a/src/modules/Image/testsuite.in
+++ b/src/modules/Image/testsuite.in
@@ -354,7 +354,8 @@ img->setcolor(255,128,0);
img->polyfill(a,b);
object img1=Image.GIF.decode(MIME.decode_base64(
-"R0lGODlhZABkAPcAAAAAAAEAAAIAAAMAAAMBAAQAAAUAAAYAAAQCAAUCAAYDAAIBAAcAAAcDAAgEAAgAAQkAAQoAAQsAAQwAAAwAAQkDAAkEAAoFAAsFAAwGAA0AARAAAhEAAhIAAhQAAg8AARUAAhYAAhcAARcAAhgAAxoAAxsAAw0GAA4HAA8HABAIABEIABIJABMKABMJABYLABQKABgMABkMABkNABoNABsNAA4AARwAAx0AAx4AAyEABCIABB8AAyIIASAABCQABCUABCYABCcABCkABSgABSoABSsABSwABS0ABSwBBC4ABTAABi8ABTEABjIABjMABjYABjUABjgABzkABzoABzoBBjsABzwABz0ABz4ABx0PAB0OAB4PAB8PACEOACEQACIRACMRACAQACQSACUSACcMACgMASYTACgTACgUACkUACkVACoVADcABjELAjQKAy4UACwWAC0WAC0XADAYADEYADIZADMaADQaADYbADcbADkcADgcADweAD0eAD4fAEEABkUACEoACUsACFEAClYAClYACV4AC0YACGQAC2cADG4ADXMADXQMCncADnsADkIVAUEgAEUiAEgjAFIIBk4mAFMpAFUqAGwTB3AYBWQfAl4uAGQxAGk0AGs1AHI1AH0AD34AD38AD4AAD4AAEIABD4EBD4ICD4QED4MDD4cGDogHDooKDY0MDowSC5AQDZISDZYUDZcXDJgYDJgRDZocC54dDKAdC6AiCqYkC6gkCqsrCq4tCrMxCbU1Cbc2CHU6AHc9AHs/AIJCAIdAAYxHAJVDApdMAIhEAJ9NAaVJAqtXALw8B7xMBbRbALxeAcJCB8VEB8ZMBcxMBcpaAtNUBdhYBNxdA8NiAMlmANJqANlsAdpnAelqAuJyAOl2AZFJAO53AO9xAfFxAfJyAfJzAfN1APV1AfB4APB4APF5APR6APN6APV7APZ3Afd4APh5APh6APl6APh7APp7APd3Afh8APd8APl9APt9APt9APx+AP1+AO93AP5/AP+AACwAAAAAZABkAAcI/wABABA4cGBBgwYRJky4kCFDDw4dRpQokWLFihcxYtTIsFCEjRtBhgw5kiRJjI6ynJQYYOVKly9fGuxAylEBmQMRbMKJk2dPh0dIkXLSUxiwnz+R9kQkdBFONvZ2Jk06deUhoaSAvCSQ7Z8k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"));
+"R0lGODlhZABkAPcAAAAAAAEAAAIAAAMAAAQAAAMBAAUAAAYAAAcAAAUCAAYDAAcDAAIBAAgAAQkAAQgEAAkEAAsAAQsBAAoAAQwAAQ4AAQoFAAwGAAsFAA0GAA4HAAQCAA8AARAAAhIAAhMAAhUAAhQAAhADABEAAhYAAhgAAxoAAxsAAxwAAx0AAxAEABEIABAIABIJAA8HABcAAh0EARMKABQKABUKABULABYLABcLABgMABkMABsNABwOAB0OAB0PAA0AAR4AAx8AAyAABCIABCEABCMGAiQAAyUABCQAAycABCgABSkABSoABSsABSwABS4ABS8ABTAABjEABjIABjMABjUABjYABjcABjkABzoABzkHBD4ABzwAB0AACD0ABz0HBR4PACAQAB8PACEQACIRACMRACQSACUSACYTACgTACcUACgUACkUACoVACwWAC0WAC0XADEPAS4XADAYADEYADIZADQaADUaADYbADgbADodADgcADweAD0eAD8fAEAgAEEgAEEhAEYACEcCBksACFAACVUACVgACl0AC2IADFkAC2gADGsBC3IADnEADXgBDXwADn0BDkcACEwaAkQfAFEdAk4mAFIoAFMpAFspAHAPCXYZBl4sAHQrAmUyAGw1AHA3AHo5AH8AD4AAD4AAEIEBD4ICD4ABD4MDD4QED4QFDoAIDYcGDowKDo0LDpAPDZISDJQUDZcWDJkaC5wcDJ4eDKEiCqUlC6gnCpYzBKsqCaswCLAuCbIyCbM0CbY4CLo5CLw8CGAHCYFBAIpFAIxIAJFKAJlNAKFQAKRTAMBBB7hOBMRFBshKBq1XALhdALteAMVjAMxNBtBPBdJWBNlYBNpbBNZjAuBgA+RlAtVrANpuAORuAeVzAOpsAu9xAet2APB2APF4ALNZAPR1AfN0AfV2AfZ2AfN6APR6APV6APZ4APZ7APZ3Afl5APl6APh5APd8APh8APl7APp7APp8APl9APp9APV7APt8APx9APx+APt+AP1/AP1+AP5/APd4AP+AACwAAAAAZABkAAcI/wABABA4cGBBgwYRJky4kCFDhw8fRpQokWLFihcxYtS4cWNHjx5Bhgw5kqTEACZNplSpkiXGDZpatpQ5c6bKT59s2tS5c2fCNfBi+vQ5lCjJAs/+SZI4wajRhBqetvz07x+ch0UASZVqp9PW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"));
+
if (img-img1>16) return ( "differ too much" );
@@ -367,7 +368,7 @@ return "ok";
test_any([[# 1 "-"
-#297 "testsuite.in.in"
+#298 "testsuite.in.in"
int i;
array a=({});
foreach (({0,1,2,3,4}),i)
diff --git a/src/modules/Image/togif.c b/src/modules/Image/togif.c
index 1f77363bc3d93ecb464959915392c30ec1ef1237..7719ac48e85be78838c133bd49a0221479420a53 100644
--- a/src/modules/Image/togif.c
+++ b/src/modules/Image/togif.c
@@ -2,7 +2,7 @@
togif
-$Id: togif.c,v 1.31 1998/04/20 18:53:34 grubba Exp $
+$Id: togif.c,v 1.32 1998/04/24 13:51:03 mirar Exp $
old GIF API compat stuff
@@ -11,7 +11,7 @@ old GIF API compat stuff
/*
**! module Image
**! note
-**! $Id: togif.c,v 1.31 1998/04/20 18:53:34 grubba Exp $
+**! $Id: togif.c,v 1.32 1998/04/24 13:51:03 mirar Exp $
**! class image
*/
@@ -318,12 +318,12 @@ static INLINE void getrgb(struct image *img,
img->rgb.r=(unsigned char)sp[-args+args_start].u.integer;
img->rgb.g=(unsigned char)sp[1-args+args_start].u.integer;
img->rgb.b=(unsigned char)sp[2-args+args_start].u.integer;
- if (args-args_start>=4) {
+ if (args-args_start>=4)
if (sp[3-args+args_start].type!=T_INT)
error("Illegal alpha argument to %s\n",name);
else
img->alpha=sp[3-args+args_start].u.integer;
- } else
+ else
img->alpha=0;
}
diff --git a/src/modules/Image/x.c b/src/modules/Image/x.c
index 8438a5188d0034d3935ab2e87b26e2ee25b86089..910ee5b1a17af05fce7cc48760f731d991b8aab2 100644
--- a/src/modules/Image/x.c
+++ b/src/modules/Image/x.c
@@ -1,4 +1,4 @@
-/* $Id: x.c,v 1.18 1998/01/16 22:09:15 grubba Exp $ */
+/* $Id: x.c,v 1.19 1998/04/24 13:50:18 mirar Exp $ */
/*
**! module Image
@@ -12,7 +12,7 @@
#include "stralloc.h"
#include "global.h"
-RCSID("$Id: x.c,v 1.18 1998/01/16 22:09:15 grubba Exp $");
+RCSID("$Id: x.c,v 1.19 1998/04/24 13:50:18 mirar Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
@@ -157,7 +157,7 @@ void image_to8bit_rgbcube(INT32 args)
redgreen=red*green;
redgreenblue=red*green*blue;
- if (args>3) {
+ if (args>3)
if (sp[3-args].type!=T_STRING)
error("Illegal argument 4 to image->to8bit_rgbcube()"
" (expected string or no argument)\n");
@@ -165,7 +165,7 @@ void image_to8bit_rgbcube(INT32 args)
error("map string is not long enough to image->to8bit_rgbcube()\n");
else
map=(unsigned char *)sp[3-args].u.string->str;
- }
+
i=THIS->xsize*THIS->ysize;
s=THIS->img;
d=(unsigned char *)res->str;