Changeset 104472 in webkit

Timestamp:

Jan 9, 2012 11:46:30 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Chromium] JPEG RGB swizzling order should match platform pixel format
​https://bugs.webkit.org/show_bug.cgi?id=75861

Choose between JCS_EXT_BGRX and JCS_EXT_RGBX channel swizzling
based on the configured Skia 32-bit pixel format.

Patch by Sami Kyostila <​skyostil@chromium.org> on 2012-01-09
Reviewed by Kenneth Russell.

• platform/image-decoders/jpeg/JPEGImageDecoder.cpp:

(rgbOutputColorSpace):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/image-decoders/jpeg/JPEGImageDecoder.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-09  Sami Kyostila  <skyostil@chromium.org>
+
+        [Chromium] JPEG RGB swizzling order should match platform pixel format
+        https://bugs.webkit.org/show_bug.cgi?id=75861
+
+        Choose between JCS_EXT_BGRX and JCS_EXT_RGBX channel swizzling
+        based on the configured Skia 32-bit pixel format.
+
+        Reviewed by Kenneth Russell.
+
+        * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
+        (rgbOutputColorSpace):
+
 2012-01-09  Alexis Menard  <alexis.menard@openbossa.org>
 

trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

@@ -76 +76 @@
 #if defined(JCS_EXTENSIONS) && ASSUME_LITTLE_ENDIAN
 #define TURBO_JPEG_RGB_SWIZZLE
+#if USE(SKIA) && (!SK_R32_SHIFT && SK_G32_SHIFT == 8 && SK_B32_SHIFT == 16)
+inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_RGBX; }
+#else
 inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_BGRX; }
+#endif
 inline bool turboSwizzled(J_COLOR_SPACE colorSpace) { return colorSpace == rgbOutputColorSpace(); }
 #else