Skip to content

Commit f964953

Browse files
committedJan 8, 2024
test/raw_decode.c: remove likely ifdef tricks related to old compilers or unusual setups
1 parent 10fe25b commit f964953

File tree

1 file changed

+0
-30
lines changed

1 file changed

+0
-30
lines changed
 

‎test/raw_decode.c

-30
Original file line numberDiff line numberDiff line change
@@ -40,36 +40,6 @@
4040

4141
#include "tiffio.h"
4242

43-
/*
44-
Libjpeg's jmorecfg.h defines INT16 and INT32, but only if XMD_H is
45-
not defined. Unfortunately, the MinGW and Borland compilers include
46-
a typedef for INT32, which causes a conflict. MSVC does not include
47-
a conficting typedef given the headers which are included.
48-
*/
49-
#if defined(__BORLANDC__) || defined(__MINGW32__)
50-
#define XMD_H 1
51-
#endif
52-
53-
/*
54-
The windows RPCNDR.H file defines boolean, but defines it with the
55-
unsigned char size. You should compile JPEG library using appropriate
56-
definitions in jconfig.h header, but many users compile library in wrong
57-
way. That causes errors of the following type:
58-
59-
"JPEGLib: JPEG parameter struct mismatch: library thinks size is 432,
60-
caller expects 464"
61-
62-
For such users we will fix the problem here. See install.doc file from
63-
the JPEG library distribution for details.
64-
*/
65-
66-
/* Define "boolean" as unsigned char, not int, per Windows custom. */
67-
#if defined(_WIN32) && !defined(__MINGW32__)
68-
#ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
69-
typedef unsigned char boolean;
70-
#endif
71-
#define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */
72-
#endif
7343
#include "jpeglib.h" /* Needed for JPEG_LIB_VERSION */
7444

7545
static unsigned char cluster_0[] = {0, 0, 2, 0, 138, 139};

0 commit comments

Comments
 (0)
Please sign in to comment.