From 714c816fbf8fb733071c02c19feaf54f54a6467c Mon Sep 17 00:00:00 2001
From: "tor%cs.brown.edu"
 <tor%cs.brown.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 18 Apr 2003 14:30:10 +0000
Subject: [PATCH] Bug 202376 - backout of checkin for 155941.  png_set_filler
 doesn't do what I expected and caused problems on macos.

git-svn-id: svn://10.0.0.236/trunk@141390 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../libpr0n/decoders/png/nsPNGDecoder.cpp     | 43 +++++++++++++++----
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp b/mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp
index 717d872072b..0317041ee88 100644
--- a/mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp
+++ b/mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp
@@ -207,11 +207,6 @@ info_callback(png_structp png_ptr, png_infop info_ptr)
   png_set_bgr(png_ptr);
 #endif
 
-#if defined(XP_MAC) || defined(XP_MACOSX)
-  // MacOS likes pixels padded to word boundaries
-  png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE);
-#endif
-
   if (png_get_gAMA(png_ptr, info_ptr, &aGamma)) {
       if (aGamma < 0)
           aGamma = 0.45455;
@@ -306,10 +301,9 @@ info_callback(png_structp png_ptr, png_infop info_ptr)
   PRUint32 bpr, abpr;
   decoder->mFrame->GetImageBytesPerRow(&bpr);
   decoder->mFrame->GetAlphaBytesPerRow(&abpr);
-  if (channels > 3) {
-    decoder->colorLine = (PRUint8 *)nsMemory::Alloc(bpr);
+  decoder->colorLine = (PRUint8 *)nsMemory::Alloc(bpr);
+  if (channels > 3)
     decoder->alphaLine = (PRUint8 *)nsMemory::Alloc(abpr);
-  }
 
   if (interlace_type == PNG_INTERLACE_ADAM7) {
     decoder->interlacebuf = (PRUint8 *)nsMemory::Alloc(channels*width*height);
@@ -388,7 +382,18 @@ row_callback(png_structp png_ptr, png_bytep new_row,
     switch (format) {
     case gfxIFormats::RGB:
     case gfxIFormats::BGR:
-      decoder->mFrame->SetImageData((PRUint8*)line, bpr, row_num*bpr);
+#if defined(XP_MAC) || defined(XP_MACOSX)
+        cptr = decoder->colorLine;
+        for (PRUint32 x=0; x<iwidth; x++) {
+          *cptr++ = 0;
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+        }
+        decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
+#else
+        decoder->mFrame->SetImageData((PRUint8*)line, bpr, row_num*bpr);
+#endif
       break;
     case gfxIFormats::RGB_A1:
     case gfxIFormats::BGR_A1:
@@ -439,6 +444,26 @@ row_callback(png_structp png_ptr, png_bytep new_row,
         decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
       }
       break;
+    case gfxIFormats::RGBA:
+    case gfxIFormats::BGRA:
+#if defined(XP_MAC) || defined(XP_MACOSX)
+      {
+        cptr = decoder->colorLine;
+        aptr = decoder->alphaLine;
+        for (PRUint32 x=0; x<iwidth; x++) {
+          *cptr++ = 0;
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+          *cptr++ = *line++;
+          *aptr++ = *line++;
+        }
+        decoder->mFrame->SetAlphaData(decoder->alphaLine, abpr, row_num*abpr);
+        decoder->mFrame->SetImageData(decoder->colorLine, bpr, row_num*bpr);
+      }
+#else
+      decoder->mFrame->SetImageData(line, bpr, row_num*bpr);
+#endif
+      break;
     }
 
     nsRect r(0, row_num, width, 1);