From 210ff264b92c6ba8b432d30dc783820509f49d66 Mon Sep 17 00:00:00 2001
From: id <id>
Date: Sun, 17 Dec 2000 14:43:08 +0000
Subject: [PATCH] I was trying to optimize this w/o using this, hope the change
 is right.

---
 wrlib/xpixmap.c | 133 +++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 83 insertions(+), 50 deletions(-)

diff --git a/wrlib/xpixmap.c b/wrlib/xpixmap.c
index a4f4a49c..d1f4a1a6 100644
--- a/wrlib/xpixmap.c
+++ b/wrlib/xpixmap.c
@@ -45,6 +45,12 @@ get_shifts(unsigned long mask)
     return i;
 }
 
+#define NORMALIZE_RED(pixel)	((rshift>0) ? ((pixel) & rmask) >> rshift \
+					: ((pixel) & rmask) << -rshift)
+#define NORMALIZE_GREEN(pixel)	((gshift>0) ? ((pixel) & gmask) >> gshift \
+					: ((pixel) & gmask) << -gshift)
+#define NORMALIZE_BLUE(pixel)	((bshift>0) ? ((pixel) & bmask) >> bshift \
+					: ((pixel) & bmask) << -bshift)
 
 RImage*
 RCreateImageFromXImage(RContext *context, XImage *image, XImage *mask)
@@ -59,12 +65,12 @@ RCreateImageFromXImage(RContext *context, XImage *image, XImage *mask)
     assert(image!=NULL);
     assert(image->format==ZPixmap);
     assert(!mask || mask->format==ZPixmap);
-    
+
     img = RCreateImage(image->width, image->height, mask!=NULL);
     if (!img) {
-	return NULL;
+        return NULL;
     }
-      
+
 
     /* I don't know why, but XGetImage() for pixmaps don't set the
      * {red,green,blue}_mask values correctly. 
@@ -86,59 +92,86 @@ RCreateImageFromXImage(RContext *context, XImage *image, XImage *mask)
 
     data = img->data;
 
-#define NORMALIZE_RED(pixel)	((rshift>0) ? ((pixel) & rmask) >> rshift \
-					: ((pixel) & rmask) << -rshift)
-#define NORMALIZE_GREEN(pixel)	((gshift>0) ? ((pixel) & gmask) >> gshift \
-					: ((pixel) & gmask) << -gshift)
-#define NORMALIZE_BLUE(pixel)	((bshift>0) ? ((pixel) & bmask) >> bshift \
-					: ((pixel) & bmask) << -bshift)
-
     if (image->depth==1) {
-	for (y = 0; y < image->height; y++) {
-	    for (x = 0; x < image->width; x++) {
-		pixel = XGetPixel(image, x, y);
-		if (pixel) {
-		    *data++ = 0;
-		    *data++ = 0;
-		    *data++ = 0;
-		} else {
-		    *data++ = 0xff;
-		    *data++ = 0xff;
-		    *data++ = 0xff;
-		}
-		if (mask)
-		    *data++ = 0;
-	    }
-	}
+        if (mask) {
+            for (y = 0; y < image->height; y++) {
+                for (x = 0; x < image->width; x++) {
+                    pixel = XGetPixel(image, x, y);
+                    if (pixel) {
+                        *data++ = 0;
+                        *data++ = 0;
+                        *data++ = 0;
+                    } else {
+                        *data++ = 0xff;
+                        *data++ = 0xff;
+                        *data++ = 0xff;
+                    }
+                    data++;
+                }
+            }
+        } else {
+            for (y = 0; y < image->height; y++) {
+                for (x = 0; x < image->width; x++) {
+                    pixel = XGetPixel(image, x, y);
+                    if (pixel) {
+                        *data++ = 0;
+                        *data++ = 0;
+                        *data++ = 0;
+                    } else {
+                        *data++ = 0xff;
+                        *data++ = 0xff;
+                        *data++ = 0xff;
+                    }
+                }
+            }
+        }
     } else {
-	for (y = 0; y < image->height; y++) {
-	    for (x = 0; x < image->width; x++) {
-		pixel = XGetPixel(image, x, y);
-		*(data++) = NORMALIZE_RED(pixel);
-		*(data++) = NORMALIZE_GREEN(pixel);
-		*(data++) = NORMALIZE_BLUE(pixel);
-		if (mask)
-		    *(data++) = 0;
-	    }
-	}
+        if (mask) {
+            for (y = 0; y < image->height; y++) {
+                for (x = 0; x < image->width; x++) {
+                    pixel = XGetPixel(image, x, y);
+                    *(data++) = NORMALIZE_RED(pixel);
+                    *(data++) = NORMALIZE_GREEN(pixel);
+                    *(data++) = NORMALIZE_BLUE(pixel);
+                    data++;
+                }
+            }
+        } else {
+            for (y = 0; y < image->height; y++) {
+                for (x = 0; x < image->width; x++) {
+                    pixel = XGetPixel(image, x, y);
+                    *(data++) = NORMALIZE_RED(pixel);
+                    *(data++) = NORMALIZE_GREEN(pixel);
+                    *(data++) = NORMALIZE_BLUE(pixel);
+                }
+            }
+        }
     }
 
-    data = img->data;
-
 #define MIN(a,b) ((a)<(b)?(a):(b))
     if (mask) {
-	for (y = 0; y < MIN(mask->height, image->height); y++) {
-	    for (x = 0; x < image->width; x++) {
-
-		data += 3;	/* Skip R, G & B */
-
-		if (mask->width <= image->width && XGetPixel(mask, x, y)) {
-		    *(data++) = 0xff;
-		} else {
-		    *(data++) = 0;
-		}
-	    }
-	}
+        data = img->data;
+        data += 3;	/* Skip R, G & B */
+        for (y = 0; y < MIN(mask->height, image->height); y++) {
+            for (x = 0; x < MIN(mask->width, image->width); x++) {
+                if (mask->width <= image->width && XGetPixel(mask, x, y)) {
+                    *data = 0xff;
+                } else {
+                    *data = 0;
+                }
+                data += 4;
+            }
+            for (; x < image->width; x++) {
+                *data = 0;
+                data += 4;
+            }
+        }
+        for (; y < image->height; y++) {
+            for (x = 0; x < image->width; x++) {
+                *data = 0;
+                data += 4;
+            }
+        }
     }
     return img;
 }
-- 
2.11.4.GIT