From 6660ffd3ac07d5f2224e72103d64e27abf3e4577 Mon Sep 17 00:00:00 2001 From: "cbiesinger%web.de" Date: Tue, 24 Sep 2002 21:21:52 +0000 Subject: [PATCH] Bug 169477 r=paper sr=alecf favicon color palette reversed or too red git-svn-id: svn://10.0.0.236/trunk@130373 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp | 9 +-------- mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.h | 7 +++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp b/mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp index 5c0c7e7f2ff..e356fe01818 100644 --- a/mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp +++ b/mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.cpp @@ -57,13 +57,6 @@ #include "ImageLogging.h" -#if defined(XP_PC) || defined(XP_BEOS) || defined(MOZ_WIDGET_PHOTON) -#define GFXFORMAT gfxIFormats::BGR -#else -#define USE_RGB -#define GFXFORMAT gfxIFormats::RGB -#endif - PRLogModuleInfo *gBMPLog = PR_NewLogModule("BMPDecoder"); NS_IMPL_ISUPPORTS1(nsBMPDecoder, imgIDecoder) @@ -253,7 +246,7 @@ NS_METHOD nsBMPDecoder::ProcessData(const char* aBuffer, PRUint32 aCount) if (!mRow) { return NS_ERROR_OUT_OF_MEMORY; } - rv = mFrame->Init(0, 0, mBIH.width, mBIH.height, GFXFORMAT); + rv = mFrame->Init(0, 0, mBIH.width, mBIH.height, BMP_GFXFORMAT); NS_ENSURE_SUCCESS(rv, rv); rv = mImage->AppendFrame(mFrame); NS_ENSURE_SUCCESS(rv, rv); diff --git a/mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.h b/mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.h index 43205dd5a86..543b190045d 100644 --- a/mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.h +++ b/mozilla/modules/libpr0n/decoders/bmp/nsBMPDecoder.h @@ -102,6 +102,13 @@ struct bitFields { #define LITTLE_TO_NATIVE32(x) x #endif +#if defined(XP_PC) || defined(XP_BEOS) || defined(MOZ_WIDGET_PHOTON) +#define BMP_GFXFORMAT gfxIFormats::BGR +#else +#define USE_RGB +#define BMP_GFXFORMAT gfxIFormats::RGB +#endif + #define BI_RLE8 1 #define BI_RLE4 2 #define BI_BITFIELDS 3