Changeset 250029 in webkit
- Timestamp:
- Sep 18, 2019 3:03:19 AM (5 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r250028 r250029 1 2019-09-18 Loïc Yhuel <loic.yhuel@softathome.com> and Fujii Hironori <Hironori.Fujii@sony.com> 2 3 JPEGImageDecoder: use libjpeg-turbo RGBA output path even for Adobe transform=0 JPEGs 4 https://bugs.webkit.org/show_bug.cgi?id=200163 5 6 Reviewed by Carlos Garcia Campos. 7 8 Remove the workaround for old libjpeg-turbo which doesn't support 9 BGRA output for Adobe transform=0 images. The bug was fixed in 10 libjpeg-turbo 1.2.1. 11 12 No new tests, no behavior change. 13 14 * platform/image-decoders/jpeg/JPEGImageDecoder.cpp: 15 (WebCore::JPEGImageReader::decode): Removed code in #if defined(TURBO_JPEG_RGB_SWIZZLE). 16 (colorSpaceHasAlpha): Removed an unused inline function. 17 1 18 2019-09-18 Joonghun Park <jh718.park@samsung.com> 2 19 -
trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
r248998 r250029 58 58 inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_EXT_BGRA; } 59 59 inline bool turboSwizzled(J_COLOR_SPACE colorSpace) { return colorSpace == JCS_EXT_RGBA || colorSpace == JCS_EXT_BGRA; } 60 inline bool colorSpaceHasAlpha(J_COLOR_SPACE colorSpace) { return turboSwizzled(colorSpace); }61 60 #else 62 61 inline J_COLOR_SPACE rgbOutputColorSpace() { return JCS_RGB; } 63 inline bool colorSpaceHasAlpha(J_COLOR_SPACE) { return false; }64 62 #endif 65 63 … … 301 299 // libjpeg can convert GRAYSCALE and YCbCr image pixels to RGB. 302 300 m_info.out_color_space = rgbOutputColorSpace(); 303 #if defined(TURBO_JPEG_RGB_SWIZZLE)304 if (m_info.saw_JFIF_marker)305 break;306 // FIXME: Swizzle decoding does not support Adobe transform=0307 // images (yet), so revert to using JSC_RGB in that case.308 if (m_info.saw_Adobe_marker && !m_info.Adobe_transform)309 m_info.out_color_space = JCS_RGB;310 #endif311 301 break; 312 302 case JCS_CMYK:
Note: See TracChangeset
for help on using the changeset viewer.