blob: 80337bccb77ce9b0d297c71423d13daa7632ebfa (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
From a73d029afe6c4df668c2dc620c9a9184e8081e90 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 2 Nov 2020 13:47:45 +0100
Subject: [PATCH 05/12] Fix libjpeg workaround for conflict with rpcndr.h
Otherwise it won't compile against mingw-w64-libjpeg-turbo. This version of
libjpeg seems to take care of the conflict already as long as jconfig.h is
included before jmorecfg.h.
Change-Id: I011b7735485689c9797cffe2646c8c3d15d0645e
---
src/plugins/imageformats/jpeg/qjpeghandler.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
index 6d88438c47..a16dae28b1 100644
--- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp
+++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
@@ -62,6 +62,7 @@
// including jpeglib.h seems to be a little messy
extern "C" {
#define XMD_H // shut JPEGlib up
+#include <jconfig.h> // ensure jconfig.h is included before jmorecfg.h
#include <jpeglib.h>
#ifdef const
# undef const // remove crazy C hackery in jconfig.h
--
2.36.1
|