From fb4cbfd0a52f9fdc9bc8729ae1ce332a151b27d5 Mon Sep 17 00:00:00 2001
From: "tor%cs.brown.edu"
 <tor%cs.brown.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 6 Jan 2004 16:36:06 +0000
Subject: [PATCH] Bug 205310 - some PNG files displayed with a garbage mask.
 r=biesi, sr=blizzard

git-svn-id: svn://10.0.0.236/trunk@150922 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/gfx/src/gtk/nsImageGTK.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/mozilla/gfx/src/gtk/nsImageGTK.cpp b/mozilla/gfx/src/gtk/nsImageGTK.cpp
index b508989d498..d9ad2d5b238 100644
--- a/mozilla/gfx/src/gtk/nsImageGTK.cpp
+++ b/mozilla/gfx/src/gtk/nsImageGTK.cpp
@@ -303,8 +303,20 @@ void nsImageGTK::UpdateCachedImage()
             break;
           case 0:
             NS_CLEAR_BIT(mask,x);
-            if (mAlphaDepth != 8)
+            if (mAlphaDepth == 0) {
               mAlphaDepth=1;
+
+              // promoting an image from no alpha channel to 1-bit, so
+              // we need to create/clear the alpha pixmap
+              CreateOffscreenPixmap(mWidth, mHeight);
+
+              XFillRectangle(GDK_WINDOW_XDISPLAY(mAlphaPixmap),
+                             GDK_WINDOW_XWINDOW(mAlphaPixmap),
+                             GDK_GC_XGC(s1bitGC),
+                             mDecodedX1, mDecodedY1,
+                             mDecodedX2 - mDecodedX1 + 1,
+                             mDecodedY2 - mDecodedY1 + 1);
+            }
             break;
           default:
             mAlphaDepth=8;
@@ -1561,8 +1573,11 @@ void nsImageGTK::CreateOffscreenPixmap(PRInt32 aWidth, PRInt32 aHeight)
        low to high address in memory. */
     mAlphaXImage->byte_order = MSBFirst;
 
-    if (!s1bitGC)
+    if (!s1bitGC) {
+      GdkColor fg = { 1, 0, 0, 0 };
       s1bitGC = gdk_gc_new(mAlphaPixmap);
+      gdk_gc_set_foreground(s1bitGC, &fg);
+    }
   }
 
   if (!sXbitGC)