From 2e739a30aa8930d77d19924126580e0e3cd47e9e Mon Sep 17 00:00:00 2001 From: "pavlov%netscape.com" Date: Wed, 13 Jun 2001 01:14:13 +0000 Subject: [PATCH] fixing image rendering color problems on photon. bug 82537. patch from briane@qnx.com. r=pavlov sr=blizzard a=asa --- modules/libimg/src/color.cpp | 6 +++--- modules/plugin/base/src/nsPluginHostImpl.cpp | 2 +- modules/plugin/nglsrc/nsPluginHostImpl.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/libimg/src/color.cpp b/modules/libimg/src/color.cpp index 635b39483ee9..6450db5d55ae 100644 --- a/modules/libimg/src/color.cpp +++ b/modules/libimg/src/color.cpp @@ -38,7 +38,7 @@ Includes dithering for B&W displays, but not dithering for PseudoColor displays which can be found in dither.c. - $Id: color.cpp,v 3.17 2001/01/10 06:12:10 jgmyers%netscape.com Exp $ + $Id: color.cpp,v 3.18 2001/06/13 01:13:35 pavlov%netscape.com Exp $ */ @@ -518,7 +518,7 @@ ConvertRGBToRGB24(il_container *ic, if (!mask) { while (sp < end) { -#if !defined(XP_UNIX) || defined(NTO) +#if !defined(XP_UNIX) || defined(MOZ_WIDGET_PHOTON) out[2] = sp[0]; out[1] = sp[1]; out[0] = sp[2]; @@ -534,7 +534,7 @@ ConvertRGBToRGB24(il_container *ic, while (sp < end) { if (*mask++) { -#if !defined(XP_UNIX) || defined(NTO) +#if !defined(XP_UNIX) || defined(MOZ_WIDGET_PHOTON) out[2] = sp[0]; out[1] = sp[1]; out[0] = sp[2]; diff --git a/modules/plugin/base/src/nsPluginHostImpl.cpp b/modules/plugin/base/src/nsPluginHostImpl.cpp index 9a96521aa56e..f596aa7eea9c 100644 --- a/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -2071,7 +2071,7 @@ NS_IMETHODIMP nsPluginHostImpl::GetValue(nsPluginManagerVariable aVariable, void NS_ENSURE_ARG_POINTER(aValue); -#if defined(XP_UNIX) && !defined(MACOSX) +#if defined(XP_UNIX) && !defined(MACOSX) && !defined(NO_X11) if (nsPluginManagerVariable_XDisplay == aVariable) { Display** value = NS_REINTERPRET_CAST(Display**, aValue); #if defined(MOZ_WIDGET_GTK) diff --git a/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/modules/plugin/nglsrc/nsPluginHostImpl.cpp index 9a96521aa56e..f596aa7eea9c 100644 --- a/modules/plugin/nglsrc/nsPluginHostImpl.cpp +++ b/modules/plugin/nglsrc/nsPluginHostImpl.cpp @@ -2071,7 +2071,7 @@ NS_IMETHODIMP nsPluginHostImpl::GetValue(nsPluginManagerVariable aVariable, void NS_ENSURE_ARG_POINTER(aValue); -#if defined(XP_UNIX) && !defined(MACOSX) +#if defined(XP_UNIX) && !defined(MACOSX) && !defined(NO_X11) if (nsPluginManagerVariable_XDisplay == aVariable) { Display** value = NS_REINTERPRET_CAST(Display**, aValue); #if defined(MOZ_WIDGET_GTK)