From 150432ff958934ef90fa46db0e8a2f343e9560bf Mon Sep 17 00:00:00 2001
From: kojima <kojima>
Date: Thu, 9 Mar 2000 22:22:41 +0000
Subject: [PATCH] added RFillImage

---
 wrlib/misc.c    | 10 +++++++---
 wrlib/png.c     |  4 ++--
 wrlib/wraster.h |  2 ++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/wrlib/misc.c b/wrlib/misc.c
index d2aeab14..15635dae 100644
--- a/wrlib/misc.c
+++ b/wrlib/misc.c
@@ -89,7 +89,7 @@ RBevelImage(RImage *image, int bevel_type)
 
 
 void
-RClearImage(RImage *image, RColor *color)
+RFillImage(RImage *image, RColor *color)
 {
     if (image->format == RRGBAFormat) {
 	    unsigned char *d = image->data;
@@ -117,7 +117,12 @@ RClearImage(RImage *image, RColor *color)
 		memcpy(d, image->data, image->width*3);
 	    }
     }
-#if 0
+}
+
+
+void
+RClearImage(RImage *image, RColor *color)
+{
     if (color->alpha==255) {
 	if (image->format == RRGBAFormat) {
 	    unsigned char *d = image->data;
@@ -171,7 +176,6 @@ RClearImage(RImage *image, RColor *color)
 	    }
 	}
     }
-#endif
 }
 
 const char*
diff --git a/wrlib/png.c b/wrlib/png.c
index 4c83542b..d6c8183d 100644
--- a/wrlib/png.c
+++ b/wrlib/png.c
@@ -128,10 +128,10 @@ RLoadPNG(RContext *context, char *file, int index)
     }
     
     /* normalize to 8bpp with alpha channel */
-    if (color_type == PNG_COLOR_TYPE_PALETTE && depth < 8)
+    if (color_type == PNG_COLOR_TYPE_PALETTE && depth <= 8)
         png_set_expand(png);
 
-    if (color_type == PNG_COLOR_TYPE_GRAY && depth < 8)
+    if (color_type == PNG_COLOR_TYPE_GRAY && depth <= 8)
         png_set_expand(png);
 
     if (png_get_valid(png, pinfo, PNG_INFO_tRNS))
diff --git a/wrlib/wraster.h b/wrlib/wraster.h
index 4fcb101a..4e398631 100644
--- a/wrlib/wraster.h
+++ b/wrlib/wraster.h
@@ -406,6 +406,8 @@ void RHSVtoRGB(RHSVColor *hsv, RColor *rgb);
  */
 void RClearImage(RImage *image, RColor *color);
 
+void RFillImage(RImage *image, RColor *color);
+    
 void RBevelImage(RImage *image, int bevel_type);
 
 RImage *RRenderGradient(unsigned width, unsigned height, RColor *from,