diff options
Diffstat (limited to 'src/Fl_GIF_Image.cxx')
| -rw-r--r-- | src/Fl_GIF_Image.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/Fl_GIF_Image.cxx b/src/Fl_GIF_Image.cxx index 93fe22f36..074a4ea32 100644 --- a/src/Fl_GIF_Image.cxx +++ b/src/Fl_GIF_Image.cxx @@ -500,8 +500,9 @@ void Fl_GIF_Image::load_gif_(Fl_Image_Reader &rdr, bool anim/*=false*/) // printf("\nFl_GIF_Image::load_gif_ : %s\n", rdr.name()); + int i; {char b[6] = { 0 }; - for (int i=0; i<6; ++i) b[i] = rdr.read_byte(); + for (i =0; i<6; ++i) b[i] = rdr.read_byte(); if (b[0]!='G' || b[1]!='I' || b[2] != 'F') { Fl::error("Fl_GIF_Image: %s is not a GIF file.\n", rdr.name()); ld(ERR_FORMAT); @@ -539,7 +540,7 @@ void Fl_GIF_Image::load_gif_(Fl_Image_Reader &rdr, bool anim/*=false*/) int YPos = 0; struct ColorMap CMap; /* color map */ if (HasColormap) { - for (int i=0; i < ColorMapSize; i++) { + for (i =0; i < ColorMapSize; i++) { CMap.Red[i] = rdr.read_byte(); CMap.Green[i] = rdr.read_byte(); CMap.Blue[i] = rdr.read_byte(); @@ -658,7 +659,7 @@ void Fl_GIF_Image::load_gif_(Fl_Image_Reader &rdr, bool anim/*=false*/) ColorMapSize = 1 << BitsPerPixel; CMap.Red[0] = CMap.Green[0] = CMap.Blue[0] = 0; // black CMap.Red[1] = CMap.Green[1] = CMap.Blue[1] = 255; // white - for (int i = 2; i < ColorMapSize; i++) { + for (i = 2; i < ColorMapSize; i++) { CMap.Red[i] = CMap.Green[i] = CMap.Blue[i] = (uchar)(255 * i / (ColorMapSize - 1)); } } @@ -670,13 +671,14 @@ void Fl_GIF_Image::load_gif_(Fl_Image_Reader &rdr, bool anim/*=false*/) // Fix transparent pixel index outside ColorMap (Issue #271) if (has_transparent && transparent_pixel >= ColorMapSize) { - for (int k = ColorMapSize; k <= transparent_pixel; k++) + int k; + for (k = ColorMapSize; k <= transparent_pixel; k++) CMap.Red[k] = CMap.Green[k] = CMap.Blue[k] = 0xff; // white (color is irrelevant) ColorMapSize = transparent_pixel + 1; } #if (0) // TEST/DEBUG: fill color table to maximum size - for (int i = ColorMapSize; i < 256; i++) { + for (i = ColorMapSize; i < 256; i++) { CMap.Red[i] = CMap.Green[i] = CMap.Blue[i] = 0; // black } #endif @@ -726,7 +728,8 @@ void Fl_GIF_Image::load_gif_(Fl_Image_Reader &rdr, bool anim/*=false*/) int ystart = YPos; if (ystart < 0) ystart = 0; int xmax = XPos + Width; if (xmax > ScreenWidth) xmax = ScreenWidth; int ymax = YPos + Height; if (ymax > ScreenHeight) ymax = ScreenHeight; - for (int y = ystart; y<ymax; y++) { + int y; + for (y = ystart; y<ymax; y++) { uchar *src = Image + (y-YPos) * Width + (xstart-XPos); uchar *dst = moved_image + y*ScreenWidth + xstart; memcpy(dst, src, xmax-xstart); |