summaryrefslogtreecommitdiff
path: root/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch')
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch
new file mode 100644
index 00000000..ef5f44ef
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.4-jpeg-9-2.patch
@@ -0,0 +1,46 @@
+Fix build with jpeg-9. Bug #646456
+
+--- a/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp 2018-01-15 12:39:43.000000000 +0100
++++ b/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp 2018-02-06 20:55:37.455912163 +0100
+@@ -57,12 +57,12 @@
+ };
+ extern "C" {
+ static boolean _src_fill_buffer(j_decompress_ptr cinfo) {
+- return 0;
++ return FALSE;
+ }
+ };
+ extern "C" {
+ static boolean _src_resync(j_decompress_ptr cinfo, int desired) {
+- return 0;
++ return FALSE;
+ }
+ };
+ extern "C" {
+@@ -126,7 +126,7 @@
+ jpeg_destroy_decompress(&cinfo);
+ return false;
+ }
+- int ret = jpeg_read_header(&cinfo, true);
++ int ret = jpeg_read_header(&cinfo, TRUE);
+ if (ret != JPEG_HEADER_OK) {
+ jpeg_destroy_decompress(&cinfo);
+ return false;
+@@ -210,7 +210,7 @@
+ }
+ cinfo.image_width = m_OrigWidth;
+ cinfo.image_height = m_OrigHeight;
+- int ret = jpeg_read_header(&cinfo, true);
++ int ret = jpeg_read_header(&cinfo, TRUE);
+ if (ret != JPEG_HEADER_OK)
+ return false;
+
+@@ -433,7 +433,7 @@
+ if (setjmp(ctx->m_JumpMark) == -1)
+ return 1;
+
+- int ret = jpeg_read_header(&ctx->m_Info, true);
++ int ret = jpeg_read_header(&ctx->m_Info, TRUE);
+ if (ret == JPEG_SUSPENDED)
+ return 2;
+ if (ret != JPEG_HEADER_OK)