wip

1 files changed, 11 insertions, 7 deletions

diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
index 5dafe503f..6c13f643f 100644
--- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
+++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
@@ -544,7 +544,8 @@ static void innards(const uchar *buf, int X, int Y, int W, int H,
     xi.bytes_per_line = linesize*sizeof(STORETYPE);
     if (buf) {
       buf += delta*dx+linedelta*dy;
-      for (int j=0; j<h; ) {
+      int j;
+      for (j =0; j<h; ) {
         STORETYPE *to = buffer;
         int k;
         for (k = 0; j<h && k<blocking; k++, j++) {
@@ -556,7 +557,7 @@ static void innards(const uchar *buf, int X, int Y, int W, int H,
       }
     } else {
       STORETYPE* linebuf = new STORETYPE[(W*delta+(sizeof(STORETYPE)-1))/sizeof(STORETYPE)];
-      for (int j=0; j<h; ) {
+      for (j =0; j<h; ) {
         STORETYPE *to = buffer;
         int k;
         for (k = 0; j<h && k<blocking; k++, j++) {
@@ -676,8 +677,10 @@ static void alpha_blend(Fl_RGB_Image *img, int X, int Y, int W, int H, int cx, i
 
   if (img->d() == 2) {
     // Composite grayscale + alpha over RGB...
-    for (int y = H; y > 0; y--, srcptr+=srcskip)
-      for (int x = W; x > 0; x--) {
+    int y;
+    for (y = H; y > 0; y--, srcptr+=srcskip)
+      int x;
+      for (x = W; x > 0; x--) {
         srcg = *srcptr++;
         srca = *srcptr++;
         if (srca == 255) { // special case "copy"
@@ -700,8 +703,8 @@ static void alpha_blend(Fl_RGB_Image *img, int X, int Y, int W, int H, int cx, i
       }
   } else {
     // Composite RGBA over RGB...
-    for (int y = H; y > 0; y--, srcptr+=srcskip)
-      for (int x = W; x > 0; x--) {
+    for (y = H; y > 0; y--, srcptr+=srcskip)
+      for (x = W; x > 0; x--) {
         srcr = *srcptr++;
         srcg = *srcptr++;
         srcb = *srcptr++;
@@ -901,7 +904,8 @@ void Fl_Xlib_Graphics_Driver::draw_fixed(Fl_Pixmap *pxm, int X, int Y, int W, in
       Region r = (Region)XRectangleRegion(X,Y,W,H);
       XIntersectRegion(r, (Region)clip_region(), r);
       int X1, Y1, W1, H1;
-      for (int i = 0; i < r->numRects; i++) {
+      int i;
+      for (i = 0; i < r->numRects; i++) {
         X1 = r->rects[i].x1;
         Y1 = r->rects[i].y1;
         W1 = r->rects[i].x2 - r->rects[i].x1;