wip

2 files changed, 17 insertions, 11 deletions

diff --git a/src/drivers/PostScript/Fl_PostScript.cxx b/src/drivers/PostScript/Fl_PostScript.cxx
index 9cece371d..35afe46f6 100644
--- a/src/drivers/PostScript/Fl_PostScript.cxx
+++ b/src/drivers/PostScript/Fl_PostScript.cxx
@@ -1107,7 +1107,8 @@ static uchar *calc_mask(uchar *img, int w, int h, Fl_Color bg)
   while (h-- > 0) { // for each row
     bit = 0x80; // byte with last bit set
     byte = 0; // next mask byte to compute
-    for (int j = 0; j < w; j++) { // for each column
+    int j;
+    for (j = 0; j < w; j++) { // for each column
       r = *img++; // the pixel color components
       g = *img++;
       b = *img++;
@@ -1168,9 +1169,11 @@ void Fl_PostScript_Graphics_Driver::transformed_draw_extra(const char* str, int
   uchar *di;
   int wmask = (w2+7)/8;
   void *rle85 = prepare_rle85();
-  for (int j = h - 1; j >= 0; j--){
+  int j;
+  for (j = h - 1; j >= 0; j--){
     di = img_mask + j * wmask;
-    for (int i = 0; i < wmask; i++){
+    int i;
+    for (i = 0; i < wmask; i++){
       write_rle85(*di, rle85);
       di++;
     }
@@ -1628,7 +1631,8 @@ static int update_format_layout(int rank, Fl_Paged_Device::Page_Layout layout,
   modal->begin();
   Fl_Choice *psize = new Fl_Choice(140, 10, 110, 30, Fl_PDF_File_Surface::format_dialog_page_size);
   psize->when(FL_WHEN_CHANGED);
-  for (int i = 0; i < size_count; i++) {
+  int i;
+  for (i = 0; i < size_count; i++) {
     psize->add(Fl_Paged_Device::page_formats[menu_to_size[i]].name);
   }
   psize->value(rank);
@@ -1682,7 +1686,8 @@ int Fl_PDF_Pango_File_Surface::begin_job(const char *defaultname, char **perr_me
   char *pref_format;
   print_prefs.get("PDF/page_size", pref_format, "A4");
   int rank = 1; // corresponds to A4
-  for (int i = 0; i < size_count; i++) {
+  int i;
+  for (i = 0; i < size_count; i++) {
     if (strcmp(pref_format, Fl_Paged_Device::page_formats[menu_to_size[i]].name) == 0) {
       rank = i;
       break;
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);