merge after backout of e7c6d7843e81

2008-09-10 22:27:21 -07:00 · 2008-09-10 22:27:21 -07:00 · 4b1435f65d
--- a/modules/libpr0n/test/reftest/pngsuite-ancillary/ccwn2c08.html
+++ b/modules/libpr0n/test/reftest/pngsuite-ancillary/ccwn2c08.html
--- a/modules/libpr0n/test/reftest/pngsuite-ancillary/ccwn3p08.html
+++ b/modules/libpr0n/test/reftest/pngsuite-ancillary/ccwn3p08.html
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@ -130,7 +130,7 @@ pref("browser.triple_click_selects_paragraph", true);

 // 0 = Off, 1 = Full, 2 = Tagged Images Only. 
 // See eCMSMode in gfx/thebes/public/gfxPlatform.h
-pref("gfx.color_management.mode", 1);
+pref("gfx.color_management.mode", 0);
 pref("gfx.color_management.display_profile", "");
 pref("gfx.color_management.rendering_intent", 0);