Attachment 374964 Details for Bug 200163 – Patch

[patch] Patch

bug-200163-20190726174125.patch (text/plain), 3.19 KB, created by Loïc Yhuel on 2019-07-26 08:41:26 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Loïc Yhuel

Created: 2019-07-26 08:41:26 PDT

Size: 3.19 KB

patch

obsolete

>Subversion Revision: 247862
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 4e22220f84a6444eec6de1f21035bae4485e8182..634c67fe2d1f8d073c91e64a8357f705b55b3465 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-07-26  LoÃ¯c Yhuel  <loic.yhuel@softathome.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 NOBODY (OOPS!).
>+
>+        https://bugs.webkit.org/show_bug.cgi?id=79457 has been fixed in libjpeg-turbo 1.2.1.
>+
>+        Covered by existing fast/images/rgb-jpeg-with-adobe-marker-only.html.
>+
>+        * platform/ImageDecoders.cmake:
>+        * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
>+        (WebCore::JPEGImageReader::decode):
>+
> 2019-07-26  Alexander Mikhaylenko  <exalm7659@gmail.com>
> 
>         REGRESSION(r246496): [GTK] Tapping the web view scrolls up a bit
>diff --git a/Source/WebCore/platform/ImageDecoders.cmake b/Source/WebCore/platform/ImageDecoders.cmake
>index 20ad55f56d9fb9bce77a2e0bf6152e9a28ea8549..30adbaf90b0238be7fd2f10092ff20788ef6401a 100644
>--- a/Source/WebCore/platform/ImageDecoders.cmake
>+++ b/Source/WebCore/platform/ImageDecoders.cmake
>@@ -62,3 +62,13 @@ if (USE_CAIRO)
>         platform/image-decoders/cairo/ImageBackingStoreCairo.cpp
>     )
> endif ()
>+
>+if (EXISTS "${JPEG_INCLUDE_DIR}/jconfig.h")
>+    file(STRINGS "${JPEG_INCLUDE_DIR}/jconfig.h" JPEG_TURBO_VERSION_LINE REGEX "^#define[\t ]+LIBJPEG_TURBO_VERSION[\t ]+.*")
>+    if (JPEG_TURBO_VERSION_LINE)
>+        string(REGEX REPLACE "^#define[\t ]+LIBJPEG_TURBO_VERSION[\t ]+([0-9\.]+).*" "\\1" JPEG_TURBO_VERSION "${JPEG_TURBO_VERSION_LINE}")
>+        if (JPEG_TURBO_VERSION VERSION_GREATER_EQUAL 1.2.1)
>+            set_property(SOURCE platform/image-decoders/jpeg/JPEGImageDecoder.cpp APPEND PROPERTY COMPILE_DEFINITIONS "LIBJPEG_TURBO_SUPPORTS_CONVERSIONS_FROM_RGB")
>+        endif ()
>+    endif ()
>+endif ()
>diff --git a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
>index b72c55a2cb909fa3461cf795f04dcead5104e8ee..1a0dff59e80b99f9ac99a23bb5f380f11027894a 100644
>--- a/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
>+++ b/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
>@@ -300,11 +300,11 @@ public:
>             case JCS_YCbCr:
>                 // libjpeg can convert GRAYSCALE and YCbCr image pixels to RGB.
>                 m_info.out_color_space = rgbOutputColorSpace();
>-#if defined(TURBO_JPEG_RGB_SWIZZLE)
>+#if defined(TURBO_JPEG_RGB_SWIZZLE) && !defined(LIBJPEG_TURBO_SUPPORTS_CONVERSIONS_FROM_RGB)
>                 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.
>+                // Swizzle decoding is not supported until libjpeg-turbo 1.2.1 for
>+                // Adobe transform=0 images, 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

Actions: View | Formatted Diff | Diff

Attachments on bug 200163: 374964 | 379020