Title: [199994] releases/WebKitGTK/webkit-2.12/Source/WebCore
- Revision
- 199994
- Author
- [email protected]
- Date
- 2016-04-25 05:11:40 -0700 (Mon, 25 Apr 2016)
Log Message
Merge r199278 - Fixed compilation of JPEGImageDecoder with libjpeg v9.
https://bugs.webkit.org/show_bug.cgi?id=156445
Patch by Konstantin Tokarev <[email protected]> on 2016-04-09
Reviewed by Michael Catanzaro.
ICU defines TRUE and FALSE macros, breaking libjpeg v9 headers.
No new tests needed.
* platform/image-decoders/jpeg/JPEGImageDecoder.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199993 => 199994)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-25 12:01:17 UTC (rev 199993)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-25 12:11:40 UTC (rev 199994)
@@ -1,3 +1,16 @@
+2016-04-09 Konstantin Tokarev <[email protected]>
+
+ Fixed compilation of JPEGImageDecoder with libjpeg v9.
+ https://bugs.webkit.org/show_bug.cgi?id=156445
+
+ Reviewed by Michael Catanzaro.
+
+ ICU defines TRUE and FALSE macros, breaking libjpeg v9 headers.
+
+ No new tests needed.
+
+ * platform/image-decoders/jpeg/JPEGImageDecoder.h:
+
2016-04-08 Said Abou-Hallawa <sabouhallawa@apple,com>
Timing attack on SVG feComposite filter circumvents same-origin policy
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h (199993 => 199994)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h 2016-04-25 12:01:17 UTC (rev 199993)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h 2016-04-25 12:11:40 UTC (rev 199994)
@@ -30,6 +30,9 @@
#include "ImageDecoder.h"
#include <stdio.h> // Needed by jpeglib.h for FILE.
+// ICU defines TRUE and FALSE macros, breaking libjpeg v9 headers
+#undef TRUE
+#undef FALSE
extern "C" {
#include "jpeglib.h"
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
