Skip to content

Commit e066c64

Browse files
committed
Merge pull request godotengine#106380 from DanielKinsman/fix_libjpegturbo_bug
Fix libjpeg-turbo not working on 32-bit builds
2 parents 428a762 + 2a89ec5 commit e066c64

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

thirdparty/libjpeg-turbo/patches/0001-cmake-generated-headers.patch

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,18 @@ index 0000000000..f6171bf846
107107
+#define PACKAGE_NAME "libjpeg-turbo"
108108
+
109109
+/* Version number of package */
110-
+#define VERSION "3.1.1"
110+
+#define VERSION "3.1.0"
111111
+
112112
+/* The size of `size_t', as computed by sizeof. */
113-
+#define SIZEOF_SIZE_T 8
113+
+#if defined(__SIZEOF_SIZE_T__)
114+
+ #define SIZEOF_SIZE_T __SIZEOF_SIZE_T__
115+
+#elif defined(_WIN64)
116+
+ #define SIZEOF_SIZE_T 8
117+
+#elif defined(_WIN32)
118+
+ #define SIZEOF_SIZE_T 4
119+
+#else
120+
+ #error "Cannot determine size of size_t"
121+
+#endif
114122
+
115123
+/* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */
116124
+#if defined(__GNUC__)

thirdparty/libjpeg-turbo/src/jconfigint.h

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,18 @@
3333
#define PACKAGE_NAME "libjpeg-turbo"
3434

3535
/* Version number of package */
36-
#define VERSION "3.1.1"
36+
#define VERSION "3.1.0"
3737

3838
/* The size of `size_t', as computed by sizeof. */
39-
#define SIZEOF_SIZE_T 8
39+
#if defined(__SIZEOF_SIZE_T__)
40+
#define SIZEOF_SIZE_T __SIZEOF_SIZE_T__
41+
#elif defined(_WIN64)
42+
#define SIZEOF_SIZE_T 8
43+
#elif defined(_WIN32)
44+
#define SIZEOF_SIZE_T 4
45+
#else
46+
#error "Cannot determine size of size_t"
47+
#endif
4048

4149
/* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */
4250
#if defined(__GNUC__)

0 commit comments

Comments
 (0)