diff --git a/src/modules/Image/blit.c b/src/modules/Image/blit.c
index bdb5aafb579bc155a0874ab257e7fe2735ae0cbb..2d3cdb7c7945b5ba5ce6e718ee0933a2277a3d68 100644
--- a/src/modules/Image/blit.c
+++ b/src/modules/Image/blit.c
@@ -1,10 +1,10 @@
-/* $Id: blit.c,v 1.26 1998/01/13 22:59:21 hubbe Exp $ */
+/* $Id: blit.c,v 1.27 1998/01/16 22:09:07 grubba Exp $ */
#include "global.h"
/*
**! module Image
**! note
-**! $Id: blit.c,v 1.26 1998/01/13 22:59:21 hubbe Exp $
+**! $Id: blit.c,v 1.27 1998/01/16 22:09:07 grubba 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;
}
@@ -394,11 +394,12 @@ 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 6c2924cc22237c3fe8720aa51745c2f855a7ddc1..40789a222a4ba39ba990e30a531f44881419e3eb 100644
--- a/src/modules/Image/colortable.c
+++ b/src/modules/Image/colortable.c
@@ -1,11 +1,11 @@
#include <config.h>
-/* $Id: colortable.c,v 1.33 1998/01/13 22:59:21 hubbe Exp $ */
+/* $Id: colortable.c,v 1.34 1998/01/16 22:09:08 grubba Exp $ */
/*
**! module Image
**! note
-**! $Id: colortable.c,v 1.33 1998/01/13 22:59:21 hubbe Exp $
+**! $Id: colortable.c,v 1.34 1998/01/16 22:09:08 grubba Exp $
**! class colortable
**!
**! This object keeps colortable information,
@@ -21,7 +21,7 @@
#undef COLORTABLE_REDUCE_DEBUG
#include "global.h"
-RCSID("$Id: colortable.c,v 1.33 1998/01/13 22:59:21 hubbe Exp $");
+RCSID("$Id: colortable.c,v 1.34 1998/01/16 22:09:08 grubba Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -431,17 +431,19 @@ static int reduce_recurse(struct nct_flat_entry *src,
diff.b*=DIFF_B_MULT;
gdiff=(gdiff*DIFF_GREY_MULT)/(sq(sf.r+sf.g+sf.b));
- if (diff.r > diff.g)
- if (diff.r > diff.b)
+ if (diff.r > diff.g) {
+ if (diff.r > diff.b) {
if (diff.r > gdiff) st=SORT_R; else st=SORT_GREY;
- else
+ } else {
if (diff.b > gdiff) st=SORT_B; else st=SORT_GREY;
- else
- if (diff.g > diff.b)
+ }
+ } else {
+ if (diff.g > diff.b) {
if (diff.g > gdiff) st=SORT_G; else st=SORT_GREY;
- else
+ } else {
if (diff.b > gdiff) st=SORT_B; else st=SORT_GREY;
-
+ }
+ }
#ifdef COLORTABLE_REDUCE_DEBUG
fprintf(stderr,"COLORTABLE%*s diff=%d,%d,%d,%ld sort=%d\n",level,"",diff.r,diff.g,diff.b,gdiff,st);
#endif
@@ -525,13 +527,14 @@ static int reduce_recurse(struct nct_flat_entry *src,
#endif
n=reduce_recurse(src,dest,left,i,level+2,sf,newpos1,space,type);
- if (n!=oldn)
+ if (n!=oldn) {
if (n<oldn) /* i certainly hope so */
MEMMOVE(dest+n,dest+oldn,sizeof(struct nct_flat_entry)*m);
else /* huh? */
/* this is the only case we don't have them already */
m=reduce_recurse(src+left,dest+n,src_size-left,
target_size-n,level+2,sf,newpos2,space,type);
+ }
#ifdef COLORTABLE_REDUCE_DEBUG
fprintf(stderr,"COLORTABLE%*s ->%d+%d=%d (retried for %d+%d=%d)\n",level,"",n,m,n+m,i,target_size-i,target_size);
#endif
@@ -2024,7 +2027,7 @@ static void image_colortable_add(INT32 args)
get_storage(sp[-args].u.object,image_program)))
{
/* get colors from image */
- if (args>=2)
+ if (args>=2) {
if (sp[1-args].type==T_INT)
{
int numcolors=sp[1-args].u.integer;
@@ -2079,6 +2082,7 @@ static void image_colortable_add(INT32 args)
}
else
error("Illegal argument 2 to Image.colortable->add|create\n");
+ }
else
{
THIS->u.flat=_img_get_flat_from_image(img,256);
@@ -2488,7 +2492,7 @@ void image_colortable_cubicles(INT32 args)
colortable_free_lookup_stuff(THIS);
THIS->lookup_mode=NCT_CUBICLES;
}
- if (args)
+ if (args) {
if (args>=3 &&
sp[-args].type==T_INT &&
sp[2-args].type==T_INT &&
@@ -2505,6 +2509,7 @@ void image_colortable_cubicles(INT32 args)
}
else
error("Illegal arguments to colortable->cubicles()\n");
+ }
else
{
THIS->lu.cubicles.r=CUBICLE_DEFAULT_R;
@@ -3287,22 +3292,22 @@ void image_colortable_floyd_steinberg(INT32 args)
float factor=0.95;
THIS->dither_type=NCTD_NONE;
- if (args>=1)
+ if (args>=1) {
if (sp[-args].type!=T_INT)
error("colortable->spacefactors(): Illegal argument 1\n");
else
THIS->du.floyd_steinberg.dir=sp[-args].u.integer;
- else
+ } else {
THIS->du.floyd_steinberg.dir=0;
-
- if (args>=6)
+ }
+ if (args>=6) {
if (sp[5-args].type==T_FLOAT)
factor=(float)sp[5-args].u.float_number;
else if (sp[5-args].type==T_INT)
factor=(float)sp[5-args].u.integer;
else
error("colortable->spacefactors(): Illegal argument 6\n");
-
+ }
if (args>=5)
{
if (sp[1-args].type==T_FLOAT)
@@ -3437,7 +3442,7 @@ void image_colortable_randomcube(INT32 args)
{
THIS->dither_type=NCTD_NONE;
- if (args>=3)
+ if (args>=3) {
if (sp[-args].type!=T_INT||
sp[1-args].type!=T_INT||
sp[2-args].type!=T_INT)
@@ -3448,6 +3453,7 @@ void image_colortable_randomcube(INT32 args)
THIS->du.randomcube.g=sp[1-args].u.integer;
THIS->du.randomcube.b=sp[2-args].u.integer;
}
+ }
else if (THIS->type==NCT_CUBE && THIS->u.cube.r &&
THIS->u.cube.g && THIS->u.cube.b)
{
@@ -3472,12 +3478,12 @@ void image_colortable_randomgrey(INT32 args)
{
THIS->dither_type=NCTD_NONE;
- if (args)
+ if (args) {
if (sp[-args].type!=T_INT)
error("Image.colortable->randomgrey(): illegal argument(s)\n");
else
THIS->du.randomcube.r=sp[-args].u.integer;
- else if (THIS->type==NCT_CUBE && THIS->u.cube.r)
+ } else if (THIS->type==NCT_CUBE && THIS->u.cube.r)
THIS->du.randomcube.r=256/THIS->u.cube.r;
else
THIS->du.randomcube.r=32;
@@ -3698,7 +3704,7 @@ void image_colortable_ordered(INT32 args)
THIS->dither_type=NCTD_NONE;
- if (args>=3)
+ if (args>=3) {
if (sp[-args].type!=T_INT||
sp[1-args].type!=T_INT||
sp[2-args].type!=T_INT)
@@ -3709,8 +3715,8 @@ void image_colortable_ordered(INT32 args)
g=sp[1-args].u.integer;
b=sp[2-args].u.integer;
}
- else if (THIS->type==NCT_CUBE && THIS->u.cube.r &&
- THIS->u.cube.g && THIS->u.cube.b)
+ } else if (THIS->type==NCT_CUBE && THIS->u.cube.r &&
+ THIS->u.cube.g && THIS->u.cube.b)
{
r=256/THIS->u.cube.r;
g=256/THIS->u.cube.g;
diff --git a/src/modules/Image/encodings/gif.c b/src/modules/Image/encodings/gif.c
index 00d24959a02d5aa6689a628b829cacc6b951c791..ded8eb6cd5ed19a3d0b61940c8d14678bf85e81f 100644
--- a/src/modules/Image/encodings/gif.c
+++ b/src/modules/Image/encodings/gif.c
@@ -1,9 +1,9 @@
-/* $Id: gif.c,v 1.24 1998/01/14 16:30:01 mirar Exp $ */
+/* $Id: gif.c,v 1.25 1998/01/16 22:09:16 grubba Exp $ */
/*
**! module Image
**! note
-**! $Id: gif.c,v 1.24 1998/01/14 16:30:01 mirar Exp $
+**! $Id: gif.c,v 1.25 1998/01/16 22:09:16 grubba Exp $
**! submodule GIF
**!
**! This submodule keep the GIF encode/decode capabilities
@@ -31,7 +31,7 @@
#include "stralloc.h"
#include "global.h"
-RCSID("$Id: gif.c,v 1.24 1998/01/14 16:30:01 mirar Exp $");
+RCSID("$Id: gif.c,v 1.25 1998/01/16 22:09:16 grubba Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
@@ -218,19 +218,19 @@ void image_gif_header_block(INT32 args)
else
error("Image.GIF.header_block(): illegal argument 3 (expected int or colortable object)\n");
- if (args>=4)
+ if (args>=4) {
if (sp[3-args].type!=T_INT)
error("Image.GIF.header_block(): illegal argument 4 (expected int)\n");
else
bkgi=sp[3-args].u.integer;
-
- if (args>=5)
+ }
+ if (args>=5) {
if (sp[4-args].type!=T_INT)
error("Image.GIF.header_block(): illegal argument 4 (expected int)\n");
else
gif87a=sp[4-args].u.integer;
-
- if (args>=7)
+ }
+ if (args>=7) {
if (sp[5-args].type!=T_INT ||
sp[6-args].type!=T_INT)
error("Image.GIF.header_block(): illegal argument(s) 5..6 (expected int)\n");
@@ -241,7 +241,7 @@ void image_gif_header_block(INT32 args)
aspect=(64*sp[5-args].u.integer)/sp[6-args].u.integer-15;
if (aspect>241) aspect=241; else if (aspect<1) aspect=1;
}
-
+ }
if (args>=10)
{
if (sp[7-args].type!=T_INT ||
@@ -795,47 +795,51 @@ CHRONO("gif render_block begin");
if (args>n) /* interlace and gce arguments */
{
- if (args>n)
+ if (args>n) {
if (sp[n-args].type!=T_INT)
error("Image:GIF.render_block(): Illegal argument %d (expected int)\n",n+1);
else
delay=sp[n-args].u.integer;
+ }
n++;
if (!alpha)
{
- if (args>n)
- if (sp[n-args].type!=T_INT)
- error("Image:GIF.render_block(): Illegal argument %d (expected int)\n",n+1);
- else
- {
- alphaidx=sp[n-args].u.integer;
- alpha=0;
- alphaentry=0;
- transparency=1;
- if (alphaidx!=-1 && numcolors<=alphaidx)
- error("Image.GIF.render_block(): illegal index to transparent color\n");
- n=6;
+ if (args>n) {
+ if (sp[n-args].type!=T_INT)
+ error("Image:GIF.render_block(): Illegal argument %d (expected int)\n",n+1);
+ else
+ {
+ alphaidx=sp[n-args].u.integer;
+ alpha=0;
+ alphaentry=0;
+ transparency=1;
+ if (alphaidx!=-1 && numcolors<=alphaidx)
+ error("Image.GIF.render_block(): illegal index to transparent color\n");
+ n=6;
+ }
}
n++;
}
- if (args>n)
+ if (args>n) {
if (sp[n-args].type!=T_INT)
error("Image:GIF.render_block(): Illegal argument %d (expected int)\n",n+1);
else
interlace=!!sp[n-args].u.integer;
+ }
n++;
- if (args>n)
+ if (args>n) {
if (sp[n-args].type!=T_INT)
error("Image:GIF.render_block(): Illegal argument %d (expected int)\n",n+1);
else
user_input=!!sp[n-args].u.integer;
+ }
n++;
- if (args>n)
+ if (args>n) {
if (sp[n-args].type!=T_INT)
error("Image:GIF.render_block(): Illegal argument %d (expected int)\n",n+1);
else
disposal=sp[n-args].u.integer&7;
-
+ }
}
}
else
@@ -1016,7 +1020,7 @@ void _image_gif_encode(INT32 args,int fs)
imgobj->refs++;
- if (args>=2)
+ if (args>=2) {
if (sp[1-args].type==T_INT)
{
if (args!=4)
@@ -1047,9 +1051,9 @@ void _image_gif_encode(INT32 args,int fs)
nctobj=NULL;
arg=1;
}
-
+ }
/* check transparency arguments */
- if (args-arg>0)
+ if (args-arg>0) {
if (sp[arg-args].type==T_OBJECT &&
(alpha=(struct image*)
get_storage(alphaobj=sp[arg-args].u.object,image_program)))
@@ -1112,7 +1116,7 @@ void _image_gif_encode(INT32 args,int fs)
tridx=trd;
trans=2;
}
-
+ }
/* make a colortable if we don't have one */
if (!nct)
{
@@ -1213,12 +1217,12 @@ void image_gif_netscape_loop_block(INT32 args)
{
unsigned short loops=0;
char buf[30];
- if (args)
+ if (args) {
if (sp[-args].type!=T_INT)
error("Image.GIF.netscape_loop_block: illegal argument (exected int)\n");
else
loops=sp[-args].u.integer;
- else
+ } else
loops=65535;
pop_n_elems(args);
@@ -1355,7 +1359,7 @@ static void _decode_get_render(unsigned char **s,
bpp=((*s)[9]&7)+1;
push_int( !!((*s)[9]&64) );
- if ( ((*s)[9]&128) )
+ if ( ((*s)[9]&128) ) {
if ((*len)>10+(unsigned long)(3<<bpp) )
{
push_string(make_shared_binary_string((*s)+10,3<<bpp));
@@ -1371,8 +1375,7 @@ static void _decode_get_render(unsigned char **s,
f_aggregate(10);
return;
}
- else
- {
+ } else {
push_int(0);
(*s)+=10;
(*len)-=10;
@@ -1676,7 +1679,7 @@ static void _gif_decode_lzw(unsigned char *s,
c[n].len=c[last].len+1;
}
else if (n>=m) break; /* illegal code */
- if (!c[n].len)
+ if (!c[n].len) {
if (n==clearcode)
{
bits=obits+1;
@@ -1685,8 +1688,7 @@ static void _gif_decode_lzw(unsigned char *s,
last=clearcode;
}
else break; /* endcode */
- else
- {
+ } else {
struct lzwc *myc;
rgb_group *d,*da=NULL;
unsigned short lc;
@@ -1703,11 +1705,12 @@ static void _gif_decode_lzw(unsigned char *s,
lc=myc->c;
if (lc<nct->u.flat.numentries)
*(--d)=nct->u.flat.entries[lc].color;
- if (alpha)
+ if (alpha) {
if (tidx==lc)
*(--da)=black;
else
*(--da)=white;
+ }
if (myc->prev==0xffff) break;
myc=c+myc->prev;
}
diff --git a/src/modules/Image/encodings/pnm.c b/src/modules/Image/encodings/pnm.c
index 1f7ca751b98b0132701fb0f44f3e2f0dc2ab6c99..256207152f3d0045a5e7bf220f8662f6f909fe3e 100644
--- a/src/modules/Image/encodings/pnm.c
+++ b/src/modules/Image/encodings/pnm.c
@@ -1,9 +1,9 @@
-/* $Id: pnm.c,v 1.10 1998/01/14 16:11:56 mirar Exp $ */
+/* $Id: pnm.c,v 1.11 1998/01/16 22:09:17 grubba Exp $ */
/*
**! module Image
**! note
-**! $Id: pnm.c,v 1.10 1998/01/14 16:11:56 mirar Exp $
+**! $Id: pnm.c,v 1.11 1998/01/16 22:09:17 grubba Exp $
**! submodule PNM
**!
**! This submodule keeps the PNM encode/decode capabilities
@@ -49,7 +49,7 @@
#include "stralloc.h"
#include "global.h"
-RCSID("$Id: pnm.c,v 1.10 1998/01/14 16:11:56 mirar Exp $");
+RCSID("$Id: pnm.c,v 1.11 1998/01/16 22:09:17 grubba Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
@@ -73,7 +73,7 @@ static INLINE unsigned char getnext(struct pike_string *s,INT32 *pos)
{
if (*pos>=s->len) return 0;
if (s->str[(*pos)]=='#')
- for (;*pos<s->len && ISSPACE(s->str[*pos]);(*pos)++);
+ for (;*pos<s->len && ISSPACE(((unsigned char *)(s->str))[*pos]);(*pos)++);
return s->str[(*pos)++];
}
@@ -93,7 +93,7 @@ static INLINE unsigned char getnext_skip_comment(struct pike_string *s,INT32 *po
static INLINE void skipwhite(struct pike_string *s,INT32 *pos)
{
while (*pos<s->len &&
- ( ISSPACE(s->str[*pos]) ||
+ ( ISSPACE(((unsigned char *)(s->str))[*pos]) ||
s->str[*pos]=='#'))
getnext_skip_comment(s,pos);
}
diff --git a/src/modules/Image/font.c b/src/modules/Image/font.c
index 246d168f691d10ad2482dcc3e5dede2073571fb4..a21aa39e44eef3a035b4d8295cbd7399c5670870 100644
--- a/src/modules/Image/font.c
+++ b/src/modules/Image/font.c
@@ -1,4 +1,4 @@
-/* $Id: font.c,v 1.25 1998/01/10 21:20:05 hubbe Exp $ */
+/* $Id: font.c,v 1.26 1998/01/16 22:09:10 grubba Exp $ */
#include <config.h>
#define SPACE_CHAR 'i'
@@ -6,7 +6,7 @@
/*
**! module Image
**! note
-**! $Id: font.c,v 1.25 1998/01/10 21:20:05 hubbe Exp $
+**! $Id: font.c,v 1.26 1998/01/16 22:09:10 grubba Exp $
**! class font
**!
**! note
@@ -259,11 +259,12 @@ 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++;
}
diff --git a/src/modules/Image/image.c b/src/modules/Image/image.c
index 1e6a0fbd6f90e02908011302ae45496b97a5a908..09fcf33db322be455652de768fc86085b90c53a1 100644
--- a/src/modules/Image/image.c
+++ b/src/modules/Image/image.c
@@ -1,9 +1,9 @@
-/* $Id: image.c,v 1.75 1998/01/16 21:25:10 grubba Exp $ */
+/* $Id: image.c,v 1.76 1998/01/16 22:09:11 grubba Exp $ */
/*
**! module Image
**! note
-**! $Id: image.c,v 1.75 1998/01/16 21:25:10 grubba Exp $
+**! $Id: image.c,v 1.76 1998/01/16 22:09:11 grubba Exp $
**! class image
**!
**! The main object of the <ref>Image</ref> module, this object
@@ -82,7 +82,7 @@
#include "stralloc.h"
#include "global.h"
-RCSID("$Id: image.c,v 1.75 1998/01/16 21:25:10 grubba Exp $");
+RCSID("$Id: image.c,v 1.76 1998/01/16 22:09:11 grubba Exp $");
#include "pike_macros.h"
#include "object.h"
#include "constants.h"
@@ -91,6 +91,7 @@ RCSID("$Id: image.c,v 1.75 1998/01/16 21:25:10 grubba Exp $");
#include "threads.h"
#include "array.h"
#include "error.h"
+#include "operators.h"
#include "image.h"
diff --git a/src/modules/Image/matrix.c b/src/modules/Image/matrix.c
index ae757b1b7e22bf4e0681b63aedf97e51d88e6831..9a2807944c9ca253c14f78e24b3775186ece385c 100644
--- a/src/modules/Image/matrix.c
+++ b/src/modules/Image/matrix.c
@@ -1,9 +1,9 @@
-/* $Id: matrix.c,v 1.13 1998/01/13 22:59:23 hubbe Exp $ */
+/* $Id: matrix.c,v 1.14 1998/01/16 22:09:12 grubba Exp $ */
/*
**! module Image
**! note
-**! $Id: matrix.c,v 1.13 1998/01/13 22:59:23 hubbe Exp $
+**! $Id: matrix.c,v 1.14 1998/01/16 22:09:12 grubba 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;
}
diff --git a/src/modules/Image/polyfill.c b/src/modules/Image/polyfill.c
index e278eebedd5b4cc31bfab8dc23119f74c304b91a..9fe8eae05587813d23dd23b876845e15091f96cd 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.18 1998/01/13 22:59:24 hubbe Exp $");
+RCSID("$Id: polyfill.c,v 1.19 1998/01/16 22:09:13 grubba 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.18 1998/01/13 22:59:24 hubbe Exp $
+**! $Id: polyfill.c,v 1.19 1998/01/16 22:09:13 grubba Exp $
**! class image
*/
@@ -128,17 +128,17 @@ static void vertex_connect(struct vertex *above,
static INLINE float vertex_xmax(struct vertex_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;
@@ -146,17 +146,17 @@ static INLINE float vertex_xmax(struct vertex_list *v,float yp,float *ydest)
static INLINE float vertex_xmin(struct vertex_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/togif.c b/src/modules/Image/togif.c
index 6df4b0a6157b090b7645a302ea0e22626b0fe993..71e5cd608eef1730548dbdfa7e1e73955c43b1a5 100644
--- a/src/modules/Image/togif.c
+++ b/src/modules/Image/togif.c
@@ -2,7 +2,7 @@
togif
-$Id: togif.c,v 1.29 1998/01/13 22:59:25 hubbe Exp $
+$Id: togif.c,v 1.30 1998/01/16 22:09:14 grubba Exp $
old GIF API compat stuff
@@ -11,7 +11,7 @@ old GIF API compat stuff
/*
**! module Image
**! note
-**! $Id: togif.c,v 1.29 1998/01/13 22:59:25 hubbe Exp $
+**! $Id: togif.c,v 1.30 1998/01/16 22:09:14 grubba Exp $
**! class image
*/
@@ -322,12 +322,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 4703b39b8795653baadd7449394ef345081290b8..8438a5188d0034d3935ab2e87b26e2ee25b86089 100644
--- a/src/modules/Image/x.c
+++ b/src/modules/Image/x.c
@@ -1,4 +1,4 @@
-/* $Id: x.c,v 1.17 1998/01/13 22:59:25 hubbe Exp $ */
+/* $Id: x.c,v 1.18 1998/01/16 22:09:15 grubba Exp $ */
/*
**! module Image
@@ -12,7 +12,7 @@
#include "stralloc.h"
#include "global.h"
-RCSID("$Id: x.c,v 1.17 1998/01/13 22:59:25 hubbe Exp $");
+RCSID("$Id: x.c,v 1.18 1998/01/16 22:09:15 grubba 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;
@@ -230,7 +230,7 @@ void image_to8bit_rgbcube_rdither(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");
@@ -238,7 +238,7 @@ void image_to8bit_rgbcube_rdither(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;