diff options
| author | Remi Collet <fedora@famillecollet.com> | 2010-09-10 18:32:25 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2010-09-10 18:32:25 +0200 |
| commit | e9289cb88946a8b278e0b8df176fa8983745d46f (patch) | |
| tree | b9ef35d3302208a825fd18779a128f65e84308cc /mozilla-libjpeg-turbo.patch | |
| parent | cbbfc6bff7b8e8a1a59739173805ab68cefcaeb7 (diff) | |
firefox-3.6.9-1
Diffstat (limited to 'mozilla-libjpeg-turbo.patch')
| -rw-r--r-- | mozilla-libjpeg-turbo.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mozilla-libjpeg-turbo.patch b/mozilla-libjpeg-turbo.patch index 9abd0e9..0016a51 100644 --- a/mozilla-libjpeg-turbo.patch +++ b/mozilla-libjpeg-turbo.patch @@ -1,7 +1,7 @@ -diff -up xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp.jpeg-turbo xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp ---- xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp.jpeg-turbo 2010-08-06 03:09:15.000000000 +0200 -+++ xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp 2010-08-16 11:19:17.000000000 +0200 -@@ -58,19 +58,6 @@ +diff -up xulrunner-1.9.2.7/mozilla-1.9.2/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp.old xulrunner-1.9.2.7/mozilla-1.9.2/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp +--- xulrunner-1.9.2.7/mozilla-1.9.2/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp.old 2010-07-13 21:10:28.000000000 +0200 ++++ xulrunner-1.9.2.7/mozilla-1.9.2/modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp 2010-07-22 12:33:21.000000000 +0200 +@@ -57,19 +57,6 @@ extern "C" { #include "iccjpeg.h" @@ -21,12 +21,12 @@ diff -up xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGD } NS_IMPL_ISUPPORTS1(nsJPEGDecoder, imgIDecoder) -@@ -443,14 +430,6 @@ nsresult nsJPEGDecoder::Write(const char +@@ -514,14 +501,6 @@ nsresult nsJPEGDecoder::ProcessData(cons return NS_OK; /* I/O suspension */ } - /* Force to use our YCbCr to Packed RGB converter when possible */ -- if (!mTransform && (gfxPlatform::GetCMSMode() != eCMSMode_All) && +- if (!mTransform && (gfxPlatform::GetCMSMode() == eCMSMode_Off) && - 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...*/ @@ -36,7 +36,7 @@ diff -up xulrunner-1.9.3.0/mozilla-central/modules/libpr0n/decoders/jpeg/nsJPEGD /* If this is a progressive JPEG ... */ mState = mInfo.buffered_image ? JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; } -@@ -616,15 +595,6 @@ nsJPEGDecoder::OutputScanlines(PRBool* s +@@ -678,15 +657,6 @@ nsJPEGDecoder::OutputScanlines(PRBool* s PRUint32 *imageRow = ((PRUint32*)mImageData) + (mInfo.output_scanline * mInfo.output_width); |