eliminate various unused variable warnings

diff --git a/PNG/impng.c b/PNG/impng.c
index 1df25ca15e1bdea05741fac0e582f9deee8b1abb..97594aa25fabdd09954766d38c2fc344e8a641fe 100644 (file)
--- a/PNG/impng.c
+++ b/PNG/impng.c
@@ -96,9 +96,8 @@ undef_int
 i_writepng_wiol(i_img *im, io_glue *ig) {
   png_structp png_ptr;
   png_infop info_ptr = NULL;
-  i_img_dim width,height,y;
+  i_img_dim width,height;
   volatile int cspace,channels;
-  unsigned char *data;
   unsigned char * volatile vdata = NULL;
   int bits;
   int is_bilevel = 0, zero_is_white;
@@ -1009,7 +1008,7 @@ set_png_tags(i_img *im, png_structp png_ptr, png_infop info_ptr) {
        }
 
        for (k = 0; k < key_size; ++k) {
-         if (key[k] < 32 || key[k] > 126 && key[k] < 161) {
+         if (key[k] < 32 || (key[k] > 126 && key[k] < 161)) {
            i_push_errorf(0, "tag %s may only contain Latin1 characters 32-126, 161-255", tag_name);
            return 0;
          }

diff --git a/datatypes.c b/datatypes.c
index 90b0b1147cb6f1e7420d7bae0de48ce6e69e5c21..e8ef231dd668453c9c6476bc8733fd77ea10304f 100644 (file)
--- a/datatypes.c
+++ b/datatypes.c
@@ -9,7 +9,6 @@
 
 struct i_bitmap*
 btm_new(i_img_dim xsize,i_img_dim ysize) {
-  i_img_dim i;
   size_t bytes;
   struct i_bitmap *btm;
   btm=(struct i_bitmap*)mymalloc(sizeof(struct i_bitmap)); /* checked 4jul05 tonyc */

diff --git a/img16.c b/img16.c
index f44f8b39da79befa6ed2dcdc3b795c52bfeecdac..970a173168545b99f34b6d3b50b4b8c5b817b6b6 100644 (file)
--- a/img16.c
+++ b/img16.c
@@ -658,7 +658,6 @@ i_psamp_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y,
   i_img_dim count, i, w;
 
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
-    int all_unmasked;
     i_img_dim offset;
     if (r > im->xsize)
       r = im->xsize;
@@ -748,7 +747,6 @@ i_psampf_d16(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y,
   i_img_dim count, i, w;
 
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
-    int all_unmasked;
     i_img_dim offset;
     if (r > im->xsize)
       r = im->xsize;

diff --git a/img8.c b/img8.c
index 8a2cb243717ca4eed23ef65aec52f460d6bd52ad..d905fa2c55d6a0fc6e01ef488b19c3d3e48e25e1 100644 (file)
--- a/img8.c
+++ b/img8.c
@@ -626,7 +626,6 @@ i_psamp_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y,
   unsigned char *data;
 
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
-    int all_unmasked;
     if (r > im->xsize)
       r = im->xsize;
     data = im->idata + (l+y*im->xsize) * im->channels;
@@ -715,7 +714,6 @@ i_psampf_d(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y,
   unsigned char *data;
 
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
-    int all_unmasked;
     if (r > im->xsize)
       r = im->xsize;
     data = im->idata + (l+y*im->xsize) * im->channels;

diff --git a/imgdouble.c b/imgdouble.c
index 0838a297b11b4de5c7b9d1b96563d93645390009..fe1ad6248b54ab58610018fb0b8eb916be20fb25 100644 (file)
--- a/imgdouble.c
+++ b/imgdouble.c
@@ -438,7 +438,6 @@ i_psamp_ddoub(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y,
   i_img_dim count, i, w;
 
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
-    int all_unmasked;
     i_img_dim offset;
     if (r > im->xsize)
       r = im->xsize;
@@ -530,7 +529,6 @@ i_psampf_ddoub(i_img *im, i_img_dim l, i_img_dim r, i_img_dim y,
   i_img_dim count, i, w;
 
   if (y >=0 && y < im->ysize && l < im->xsize && l >= 0) {
-    int all_unmasked;
     i_img_dim offset;
     if (r > im->xsize)
       r = im->xsize;

diff --git a/rotate.im b/rotate.im
index 8a2a226bae04864824eafc8493eb22f60344cdaa..be72750509c393b3c352d74054e229588b15251e 100644 (file)
--- a/rotate.im
+++ b/rotate.im
@@ -207,7 +207,6 @@ i_img *i_matrix_transform_bg(i_img *src, i_img_dim xsize, i_img_dim ysize, const
 #code src->bits <= 8
     IM_COLOR *vals = mymalloc(xsize * sizeof(IM_COLOR));
     IM_COLOR back;
-    i_fsample_t fsamp;
 
 #ifdef IM_EIGHT_BIT
     if (backp) {
@@ -215,6 +214,7 @@ i_img *i_matrix_transform_bg(i_img *src, i_img_dim xsize, i_img_dim ysize, const
     }
     else if (fbackp) {
       for (ch = 0; ch < src->channels; ++ch) {
+       i_fsample_t fsamp;
        fsamp = fbackp->channel[ch];
        back.channel[ch] = fsamp < 0 ? 0 : fsamp > 1 ? 255 : fsamp * 255;
       }