]>
Commit | Line | Data |
---|---|---|
1347c76c AM |
1 | This reverts http://trac.webkit.org/changeset/101286 |
2 | to fix Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=393471 | |
3 | ||
4 | Index: third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp | |
5 | =================================================================== | |
6 | --- third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp (revision 96970) | |
7 | +++ third_party/WebKit/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp (revision 101286) | |
ea4b0ece | 8 | @@ -67,24 +67,6 @@ |
1347c76c AM |
9 | |
10 | #include <setjmp.h> | |
11 | ||
12 | -#if CPU(BIG_ENDIAN) || CPU(MIDDLE_ENDIAN) | |
13 | -#define ASSUME_LITTLE_ENDIAN 0 | |
14 | -#else | |
15 | -#define ASSUME_LITTLE_ENDIAN 1 | |
16 | -#endif | |
17 | - | |
ea4b0ece | 18 | -#if defined(JCS_ALPHA_EXTENSIONS) && ASSUME_LITTLE_ENDIAN |
1347c76c | 19 | -#define TURBO_JPEG_RGB_SWIZZLE |
ea4b0ece AM |
20 | -#if USE(SKIA) && (!SK_R32_SHIFT && SK_G32_SHIFT == 8 && SK_B32_SHIFT == 16) |
21 | -inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_RGBA; } | |
22 | -#else | |
23 | -inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_BGRA; } | |
24 | -#endif | |
1347c76c AM |
25 | -inline bool turboSwizzled(J_COLOR_SPACE colorSpace) { return colorSpace == rgbOutputColorSpace(); } |
26 | -#else | |
27 | -inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_RGB; } | |
28 | -#endif | |
29 | - | |
30 | namespace WebCore { | |
31 | ||
32 | struct decoder_error_mgr { | |
ea4b0ece | 33 | @@ -270,7 +252,7 @@ |
1347c76c AM |
34 | case JCS_RGB: |
35 | case JCS_YCbCr: | |
ea4b0ece | 36 | // libjpeg can convert GRAYSCALE and YCbCr image pixels to RGB. |
1347c76c AM |
37 | - m_info.out_color_space = rgbOutputColorSpace(); |
38 | + m_info.out_color_space = JCS_RGB; | |
39 | break; | |
40 | case JCS_CMYK: | |
41 | case JCS_YCCK: | |
ea4b0ece | 42 | @@ -525,19 +507,6 @@ |
1347c76c AM |
43 | } |
44 | ||
45 | jpeg_decompress_struct* info = m_reader->info(); | |
46 | - | |
47 | -#if !ENABLE(IMAGE_DECODER_DOWN_SAMPLING) && defined(TURBO_JPEG_RGB_SWIZZLE) | |
48 | - if (turboSwizzled(info->out_color_space)) { | |
49 | - ASSERT(!m_scaled); | |
50 | - while (info->output_scanline < info->output_height) { | |
51 | - unsigned char* row = reinterpret_cast<unsigned char*>(buffer.getAddr(0, info->output_scanline)); | |
52 | - if (jpeg_read_scanlines(info, &row, 1) != 1) | |
53 | - return false; | |
54 | - } | |
55 | - return true; | |
56 | - } | |
57 | -#endif | |
58 | - | |
59 | JSAMPARRAY samples = m_reader->samples(); | |
60 | ||
61 | while (info->output_scanline < info->output_height) { |