Branch: refs/heads/webkitglib/2.40 Home: https://github.com/WebKit/WebKit Commit: f7d80205f8f8c1af30cb9797c64a32661c74a275 https://github.com/WebKit/WebKit/commit/f7d80205f8f8c1af30cb9797c64a32661c74a275 Author: Giulio Benetti <giulio.bene...@benettiengineering.com> Date: 2023-02-22 (Wed, 22 Feb 2023)
Changed paths: M Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h Log Message: ----------- Cherry-pick 260633@main (360f2f938bba). https://bugs.webkit.org/show_bug.cgi?id=252666 Fix JPEGImageDecoder boolean enum and #define TRUE/FALSE mix https://bugs.webkit.org/show_bug.cgi?id=252666 Reviewed by Michael Catanzaro. jpeglib.h contains a typedef enum for boolean type but LCMSUniquePtr.h include files that can contain #define TRUE/FALSE. This way build fails with: JPEGImageDecoder.cpp:343:43: error: invalid conversion from ‘int’ to ‘boolean’ This is because TRUE or FALSE should be an enum instead they get defined as 1 or 0. To fix this move jpeglib.h inclusion after LCMSUniquePtr.h inclusion. Let's also use angular paranthesis since jpeglib.h is a system path header. Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h: Signed-off-by: Giulio Benetti <giulio.bene...@benettiengineering.com> Canonical link: https://commits.webkit.org/260633@main Commit: 75aa66c9bbc7e3c6650f8d4eaca31063b8cfad27 https://github.com/WebKit/WebKit/commit/75aa66c9bbc7e3c6650f8d4eaca31063b8cfad27 Author: Diego Pino Garcia <dp...@igalia.com> Date: 2023-02-22 (Wed, 22 Feb 2023) Changed paths: M Source/WebCore/platform/gtk/PlatformScreenGtk.cpp Log Message: ----------- Cherry-pick 260653@main (b532446622b6). <bug> [GTK] Unreviewed, build fix for Ubuntu 20.04 and Debian Stable after 260590@main The change triggered several unified source build errors. Canonical link: https://commits.webkit.org/260653@main Compare: https://github.com/WebKit/WebKit/compare/2ff74956a581...75aa66c9bbc7 _______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes