Changeset 250029 in webkit

Timestamp:

Sep 18, 2019 3:03:19 AM (5 years ago)

Author:

Fujii Hironori

Message:

JPEGImageDecoder: use libjpeg-turbo RGBA output path even for Adobe transform=0 JPEGs
​https://bugs.webkit.org/show_bug.cgi?id=200163

Reviewed by Carlos Garcia Campos.

Remove the workaround for old libjpeg-turbo which doesn't support
BGRA output for Adobe transform=0 images. The bug was fixed in
libjpeg-turbo 1.2.1.

No new tests, no behavior change.

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

(WebCore::JPEGImageReader::decode): Removed code in #if defined(TURBO_JPEG_RGB_SWIZZLE).
(colorSpaceHasAlpha): Removed an unused inline function.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-09-18  Loïc Yhuel  <loic.yhuel@softathome.com>  and  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        JPEGImageDecoder: use libjpeg-turbo RGBA output path even for Adobe transform=0 JPEGs
+        https://bugs.webkit.org/show_bug.cgi?id=200163
+
+        Reviewed by Carlos Garcia Campos.
+
+        Remove the workaround for old libjpeg-turbo which doesn't support
+        BGRA output for Adobe transform=0 images. The bug was fixed in
+        libjpeg-turbo 1.2.1.
+
+        No new tests, no behavior change.
+
+        * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
+        (WebCore::JPEGImageReader::decode): Removed code in #if defined(TURBO_JPEG_RGB_SWIZZLE).
+        (colorSpaceHasAlpha): Removed an unused inline function.
+
 2019-09-18  Joonghun Park  <jh718.park@samsung.com>
 

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

@@ -58 +58 @@
 inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_BGRA; }
 inline bool turboSwizzled(J_COLOR_SPACE colorSpace) { return colorSpace == JCS_EXT_RGBA || colorSpace == JCS_EXT_BGRA; }
-inline bool colorSpaceHasAlpha(J_COLOR_SPACE colorSpace) { return turboSwizzled(colorSpace); }
 #else
 inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_RGB; }
-inline bool colorSpaceHasAlpha(J_COLOR_SPACE) { return false; }
 #endif
 
@@ -301 +299 @@
                 // libjpeg can convert GRAYSCALE and YCbCr image pixels to RGB.
                 m_info.out_color_space = rgbOutputColorSpace();
-#if defined(TURBO_JPEG_RGB_SWIZZLE)
-                if (m_info.saw_JFIF_marker)
-                    break;
-                // FIXME: Swizzle decoding does not support Adobe transform=0
-                // images (yet), so revert to using JSC_RGB in that case.
-                if (m_info.saw_Adobe_marker && !m_info.Adobe_transform)
-                    m_info.out_color_space = JCS_RGB;
-#endif
                 break;
             case JCS_CMYK: