| 1 |
phajdan.jr 12/01/11 17:38:01 |
| 2 |
|
| 3 |
Added: chromium-revert-jpeg-swizzle-r1.patch |
| 4 |
Log: |
| 5 |
Version bump for dev channel release. Disable DnsConfigServiceTest.GetSystemConfig test, bug #394883 by Jonathan Lovelace. Disable MessagePumpLibeventTest.DeleteWatcher test, bug #398501. NaCl binaries should work now, bug #389479 by Tatsh fixed upstream. |
| 6 |
|
| 7 |
(Portage version: 2.1.10.41/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 www-client/chromium/files/chromium-revert-jpeg-swizzle-r1.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-revert-jpeg-swizzle-r1.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-revert-jpeg-swizzle-r1.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: chromium-revert-jpeg-swizzle-r1.patch |
| 16 |
=================================================================== |
| 17 |
This reverts http://trac.webkit.org/changeset/101286 |
| 18 |
to fix Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=393471 |
| 19 |
|
| 20 |
Index: third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp |
| 21 |
=================================================================== |
| 22 |
--- third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp (revision 96970) |
| 23 |
+++ third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp (revision 101286) |
| 24 |
@@ -67,24 +67,6 @@ |
| 25 |
|
| 26 |
#include <setjmp.h> |
| 27 |
|
| 28 |
-#if CPU(BIG_ENDIAN) || CPU(MIDDLE_ENDIAN) |
| 29 |
-#define ASSUME_LITTLE_ENDIAN 0 |
| 30 |
-#else |
| 31 |
-#define ASSUME_LITTLE_ENDIAN 1 |
| 32 |
-#endif |
| 33 |
- |
| 34 |
-#if defined(JCS_EXTENSIONS) && ASSUME_LITTLE_ENDIAN |
| 35 |
-#define TURBO_JPEG_RGB_SWIZZLE |
| 36 |
-#if USE(SKIA) && (!SK_R32_SHIFT && SK_G32_SHIFT == 8 && SK_B32_SHIFT == 16) |
| 37 |
-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_RGBX; } |
| 38 |
-#else |
| 39 |
-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_BGRX; } |
| 40 |
-#endif |
| 41 |
-inline bool turboSwizzled(J_COLOR_SPACE colorSpace) { return colorSpace == rgbOutputColorSpace(); } |
| 42 |
-#else |
| 43 |
-inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_RGB; } |
| 44 |
-#endif |
| 45 |
- |
| 46 |
namespace WebCore { |
| 47 |
|
| 48 |
struct decoder_error_mgr { |
| 49 |
@@ -270,7 +252,7 @@ |
| 50 |
case JCS_RGB: |
| 51 |
case JCS_YCbCr: |
| 52 |
// libjpeg can convert GRAYSCALE and YCbCr image pixels to RGB. |
| 53 |
- m_info.out_color_space = rgbOutputColorSpace(); |
| 54 |
+ m_info.out_color_space = JCS_RGB; |
| 55 |
break; |
| 56 |
case JCS_CMYK: |
| 57 |
case JCS_YCCK: |
| 58 |
@@ -525,19 +507,6 @@ |
| 59 |
} |
| 60 |
|
| 61 |
jpeg_decompress_struct* info = m_reader->info(); |
| 62 |
- |
| 63 |
-#if !ENABLE(IMAGE_DECODER_DOWN_SAMPLING) && defined(TURBO_JPEG_RGB_SWIZZLE) |
| 64 |
- if (turboSwizzled(info->out_color_space)) { |
| 65 |
- ASSERT(!m_scaled); |
| 66 |
- while (info->output_scanline < info->output_height) { |
| 67 |
- unsigned char* row = reinterpret_cast<unsigned char*>(buffer.getAddr(0, info->output_scanline)); |
| 68 |
- if (jpeg_read_scanlines(info, &row, 1) != 1) |
| 69 |
- return false; |
| 70 |
- } |
| 71 |
- return true; |
| 72 |
- } |
| 73 |
-#endif |
| 74 |
- |
| 75 |
JSAMPARRAY samples = m_reader->samples(); |
| 76 |
|
| 77 |
while (info->output_scanline < info->output_height) { |
Archives