diff options
Diffstat (limited to 'src/Fl_Image.cxx')
| -rw-r--r-- | src/Fl_Image.cxx | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/Fl_Image.cxx b/src/Fl_Image.cxx index aa4837d26..00023bb17 100644 --- a/src/Fl_Image.cxx +++ b/src/Fl_Image.cxx @@ -637,24 +637,26 @@ Fl_RGB_Image *Fl_RGB_Image::copy_scale_down_2h_() const { if ((W==0) || (H==0) || (D==0)) return 0; uchar *data = (uchar*)malloc(W*H*D); uchar *dst = data; - for (int y = 0; y < H; y++) { + int y; + for (y = 0; y < H; y++) { const uchar *src = array + y*LD; switch (D) { case 1: - for (int x=0; x<W; ++x) { + int x; + for (x =0; x<W; ++x) { *dst++ = ((uchar) ( ( ((unsigned)src[0]) + ((unsigned)src[1]) ) >> 1 )); src += 2; } break; case 2: - for (int x=0; x<W; ++x) { + for (x =0; x<W; ++x) { *dst++ = ((uchar) ( ( ((unsigned)src[0]) + ((unsigned)src[2]) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)src[1]) + ((unsigned)src[3]) ) >> 1 )); src += 4; } break; case 3: - for (int x=0; x<W; ++x) { + for (x =0; x<W; ++x) { *dst++ = ((uchar) ( ( ((unsigned)src[0]) + ((unsigned)src[3]) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)src[1]) + ((unsigned)src[4]) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)src[2]) + ((unsigned)src[5]) ) >> 1 )); @@ -662,7 +664,7 @@ Fl_RGB_Image *Fl_RGB_Image::copy_scale_down_2h_() const { } break; case 4: - for (int x=0; x<W; ++x) { + for (x =0; x<W; ++x) { *dst++ = ((uchar) ( ( ((unsigned)src[0]) + ((unsigned)src[4]) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)src[1]) + ((unsigned)src[5]) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)src[2]) + ((unsigned)src[6]) ) >> 1 )); @@ -683,30 +685,32 @@ Fl_RGB_Image *Fl_RGB_Image::copy_scale_down_2v_() const { if ((W==0) || (H==0) || (D==0)) return 0; uchar *data = (uchar*)malloc(W*H*D); uchar *dst = data; - for (int y = 0; y < H; y++) { + int y; + for (y = 0; y < H; y++) { const uchar *s0 = array + 2*y*LD; const uchar *s1 = s0 + LD; switch (D) { case 1: - for (int x=0; x<W; ++x) { + int x; + for (x =0; x<W; ++x) { *dst++ = ((uchar) ( ( ((unsigned)*s0++) + ((unsigned)*s1++) ) >> 1 )); } break; case 2: - for (int x=0; x<W; ++x) { + for (x =0; x<W; ++x) { *dst++ = ((uchar) ( ( ((unsigned)*s0++) + ((unsigned)*s1++) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)*s0++) + ((unsigned)*s1++) ) >> 1 )); } break; case 3: - for (int x=0; x<W; ++x) { + for (x =0; x<W; ++x) { *dst++ = ((uchar) ( ( ((unsigned)*s0++) + ((unsigned)*s1++) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)*s0++) + ((unsigned)*s1++) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)*s0++) + ((unsigned)*s1++) ) >> 1 )); } break; case 4: - for (int x=0; x<W; ++x) { + for (x =0; x<W; ++x) { *dst++ = ((uchar) ( ( ((unsigned)*s0++) + ((unsigned)*s1++) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)*s0++) + ((unsigned)*s1++) ) >> 1 )); *dst++ = ((uchar) ( ( ((unsigned)*s0++) + ((unsigned)*s1++) ) >> 1 )); |