diff options
Diffstat (limited to 'src/drivers/PostScript/Fl_PostScript_image.cxx')
| -rw-r--r-- | src/drivers/PostScript/Fl_PostScript_image.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/drivers/PostScript/Fl_PostScript_image.cxx b/src/drivers/PostScript/Fl_PostScript_image.cxx index ebb91cf03..26eb31a89 100644 --- a/src/drivers/PostScript/Fl_PostScript_image.cxx +++ b/src/drivers/PostScript/Fl_PostScript_image.cxx @@ -100,6 +100,7 @@ void Fl_PostScript_Graphics_Driver::draw_rgb_bitmap_(Fl_Image *img,int XP, int Y int stride = cairo_format_stride_for_width(format, img->data_w()); uchar *BGRA = new uchar[stride * img->data_h()]; memset(BGRA, 0, stride * img->data_h()); + int i, j; if (img->d() >= 1) { // process Fl_RGB_Image of all depths Fl_RGB_Image *rgb = (Fl_RGB_Image*)img; int lrgb = rgb->ld() ? rgb->ld() : rgb->data_w() * rgb->d(); @@ -107,10 +108,10 @@ void Fl_PostScript_Graphics_Driver::draw_rgb_bitmap_(Fl_Image *img,int XP, int Y const uchar *r; float f = 1; if (rgb->d() >= 3) { // color images - for (int j = 0; j < rgb->data_h(); j++) { + for (j = 0; j < rgb->data_h(); j++) { r = rgb->array + j * lrgb; q = BGRA + j * stride; - for (int i = 0; i < rgb->data_w(); i++) { + for (i = 0; i < rgb->data_w(); i++) { R = *r; G = *(r+1); B = *(r+2); @@ -126,10 +127,10 @@ void Fl_PostScript_Graphics_Driver::draw_rgb_bitmap_(Fl_Image *img,int XP, int Y } } } else if (rgb->d() == 1 || rgb->d() == 2) { // B&W - for (int j = 0; j < rgb->data_h(); j++) { + for (j = 0; j < rgb->data_h(); j++) { r = rgb->array + j * lrgb; q = BGRA + j * stride; - for (int i = 0; i < rgb->data_w(); i++) { + for (i = 0; i < rgb->data_w(); i++) { G = *r; if (rgb->d() == 2) { A = *(r+1); @@ -147,12 +148,12 @@ void Fl_PostScript_Graphics_Driver::draw_rgb_bitmap_(Fl_Image *img,int XP, int Y Fl_Bitmap *bm = (Fl_Bitmap*)img; uchar *r, p; unsigned *q; - for (int j = 0; j < bm->data_h(); j++) { + for (j = 0; j < bm->data_h(); j++) { r = (uchar*)bm->array + j * ((bm->data_w() + 7)/8); q = (unsigned*)(BGRA + j * stride); unsigned k = 0, mask32 = 1; p = *r; - for (int i = 0; i < bm->data_w(); i++) { + for (i = 0; i < bm->data_w(); i++) { if (p&1) (*q) |= mask32; k++; if (k % 8 != 0) p >>= 1; else p = *(++r); |
