From 216a445846c995e88694a2ba65974d48bc3b92b0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 22 Jan 2011 17:32:34 +0100 Subject: Firefox 4.0b10 build1 candidate --- firefox4-libjpeg-turbo.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'firefox4-libjpeg-turbo.patch') diff --git a/firefox4-libjpeg-turbo.patch b/firefox4-libjpeg-turbo.patch index 3aadec4..c2fee7f 100644 --- a/firefox4-libjpeg-turbo.patch +++ b/firefox4-libjpeg-turbo.patch @@ -1,11 +1,12 @@ ---- mozilla-central/modules/libpr0n/decoders/nsJPEGDecoder.cpp.jpeg-turbo 2010-11-04 21:06:43.000000000 +0100 -+++ mozilla-central/modules/libpr0n/decoders/nsJPEGDecoder.cpp 2010-11-06 10:46:04.081880464 +0100 -@@ -411,14 +411,6 @@ +diff -up mozilla-central/modules/libpr0n/decoders/nsJPEGDecoder.cpp.jpeg-turbo mozilla-central/modules/libpr0n/decoders/nsJPEGDecoder.cpp +--- mozilla-central/modules/libpr0n/decoders/nsJPEGDecoder.cpp.jpeg-turbo 2011-01-22 01:28:24.000000000 +0100 ++++ mozilla-central/modules/libpr0n/decoders/nsJPEGDecoder.cpp 2011-01-22 16:47:15.003018762 +0100 +@@ -416,14 +416,6 @@ nsJPEGDecoder::WriteInternal(const char return; /* I/O suspension */ } - /* Force to use our YCbCr to Packed RGB converter when possible */ -- if (!mTransform && (gfxPlatform::GetCMSMode() != eCMSMode_All) && +- if (!mTransform && (mCMSMode != eCMSMode_All) && - mInfo.jpeg_color_space == JCS_YCbCr && mInfo.out_color_space == JCS_RGB) { - /* Special case for the most common case: transform from YCbCr direct into packed ARGB */ - mInfo.out_color_components = 4; /* Packed ARGB pixels are always 4 bytes...*/ @@ -15,7 +16,7 @@ /* If this is a progressive JPEG ... */ mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; } -@@ -563,15 +555,6 @@ +@@ -568,15 +560,6 @@ nsJPEGDecoder::OutputScanlines(PRBool* s PRUint32 *imageRow = ((PRUint32*)mImageData) + (mInfo.output_scanline * mInfo.output_width); -- cgit