Title: [199278] trunk/Source/WebCore
- Revision
- 199278
- Author
- commit-qu...@webkit.org
- Date
- 2016-04-09 18:46:27 -0700 (Sat, 09 Apr 2016)
Log Message
Fixed compilation of JPEGImageDecoder with libjpeg v9.
https://bugs.webkit.org/show_bug.cgi?id=156445
Patch by Konstantin Tokarev <annu...@yandex.ru> 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: trunk/Source/WebCore/ChangeLog (199277 => 199278)
--- trunk/Source/WebCore/ChangeLog 2016-04-10 00:26:25 UTC (rev 199277)
+++ trunk/Source/WebCore/ChangeLog 2016-04-10 01:46:27 UTC (rev 199278)
@@ -1,3 +1,16 @@
+2016-04-09 Konstantin Tokarev <annu...@yandex.ru>
+
+ 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-09 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r199242.
Modified: trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h (199277 => 199278)
--- trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h 2016-04-10 00:26:25 UTC (rev 199277)
+++ trunk/Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h 2016-04-10 01:46:27 UTC (rev 199278)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
