xref: /AOO41X/main/jpeg/jpeg-8d.patch (revision 50dd13c32651d336fa390ed99e13d19face05cbf)
1--- misc/jpeg-8d/jconfig.h  2011-03-30 11:20:06.266329889 +0200
2+++ misc/build/jpeg-8d/jconfig.h    2011-03-30 11:02:01.926080079 +0200
3@@ -1 +1,60 @@
4-dummy
5+/* jconfig.h.  Generated from jconfig.cfg by configure.  */
6+/* jconfig.cfg --- source file edited by configure script */
7+/* see jconfig.txt for explanations */
8+
9+#define HAVE_PROTOTYPES 1
10+#define HAVE_UNSIGNED_CHAR 1
11+#define HAVE_UNSIGNED_SHORT 1
12+/* #undef void */
13+/* #undef const */
14+/* #undef CHAR_IS_UNSIGNED */
15+#define HAVE_STDDEF_H 1
16+#define HAVE_STDLIB_H 1
17+#define HAVE_LOCALE_H 1
18+/* #undef NEED_BSD_STRINGS */
19+/* #undef NEED_SYS_TYPES_H */
20+/* #undef NEED_FAR_POINTERS */
21+/* #undef NEED_SHORT_EXTERNAL_NAMES */
22+/* Define this if you get warnings about undefined structures. */
23+/* #undef INCOMPLETE_TYPES_BROKEN */
24+
25+/* Define "boolean" as unsigned char, not int, on Windows systems. */
26+#ifdef WNT
27+#ifndef __RPCNDR_H__       /* don't conflict if rpcndr.h already read */
28+typedef unsigned char boolean;
29+#endif
30+#define HAVE_BOOLEAN       /* prevent jmorecfg.h from redefining it */
31+#endif
32+
33+#ifdef JPEG_INTERNALS
34+
35+/* #undef RIGHT_SHIFT_IS_UNSIGNED */
36+#ifdef WNT
37+#define INLINE __inline
38+#elif defined SOLARIS
39+#define INLINE
40+#else
41+#define INLINE inline
42+#endif
43+/* These are for configuring the JPEG memory manager. */
44+/* #undef DEFAULT_MAX_MEM */
45+/* #undef NO_MKTEMP */
46+
47+#endif /* JPEG_INTERNALS */
48+
49+#ifdef JPEG_CJPEG_DJPEG
50+
51+#undef BMP_SUPPORTED       /* BMP image file format */
52+#undef GIF_SUPPORTED       /* GIF image file format */
53+#undef PPM_SUPPORTED       /* PBMPLUS PPM/PGM image file format */
54+/* #undef RLE_SUPPORTED    */
55+#undef TARGA_SUPPORTED /* Targa image file format */
56+
57+/* #undef TWO_FILE_COMMANDLINE */
58+/* #undef NEED_SIGNAL_CATCHER  */
59+/* #undef DONT_USE_B_MODE      */
60+
61+/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
62+/* #undef PROGRESS_REPORT      */
63+
64+#endif /* JPEG_CJPEG_DJPEG     */
65--- misc/jpeg-8d/jmorecfg.h 2009-11-20 09:01:24.000000000 +0100
66+++ misc/build/jpeg-8d/jmorecfg.h   2011-03-24 21:29:02.073761750 +0100
67@@ -21,7 +21,7 @@
68  * We do not support run-time selection of data precision, sorry.
69  */
70
71-#define BITS_IN_JSAMPLE  8 /* use 8 or 12 */
72+#define BITS_IN_JSAMPLE  8 /* use 8                                                                                                                                                                                                                             or 12 */
73
74
75 /*
76@@ -158,7 +158,8 @@
77
78 /* INT32 must hold at least signed 32-bit values. */
79
80-#ifndef XMD_H          /* X11/xmd.h correctly defines INT32 */
81+#ifndef XMD_H           /* X11/xmd.h correctly defines INT32 */
82+#ifndef _SOLAR_H
83 #ifndef _BASETSD_H_        /* Microsoft defines it in basetsd.h */
84 #ifndef _BASETSD_H     /* MinGW is slightly different */
85 #ifndef QGLOBAL_H      /* Qt defines it in qglobal.h */
86@@ -166,6 +167,7 @@
87 #endif
88 #endif
89 #endif
90+#endif
91 #endif
92
93 /* Datatype used for image dimensions.  The JPEG standard only supports
94--- misc/jpeg-8d/makefile.mk    2011-03-24 21:20:52.540761397 +0100
95+++ misc/build/jpeg-8d/makefile.mk  2011-03-24 21:15:20.712761156 +0100
96@@ -1 +1,77 @@
97-dummy
98+#*************************************************************************
99+#
100+#   Copyright according the GNU Public License.
101+#
102+#*************************************************************************
103+
104+PRJ=..$/..$/..$/..
105+
106+PRJNAME=jpeg
107+TARGET=jpeglib
108+LIBTARGET=NO
109+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
110+VISIBILITY_HIDDEN=TRUE
111+
112+# --- Settings -----------------------------------------------------------
113+
114+.INCLUDE :  settings.mk
115+
116+.IF "$(GUI)$(CPU)"=="WNTP"
117+CFLAGS=$(CFLAGS) -Od
118+.ENDIF
119+
120+# --- Files --------------------------------------------------------
121+
122+SLOFILES=  $(SLO)$/jaricom.obj     \
123+           $(SLO)$/jcapimin.obj    \
124+           $(SLO)$/jcapistd.obj    \
125+           $(SLO)$/jcarith.obj     \
126+           $(SLO)$/jccoefct.obj    \
127+           $(SLO)$/jccolor.obj     \
128+           $(SLO)$/jcdctmgr.obj    \
129+           $(SLO)$/jchuff.obj      \
130+           $(SLO)$/jcinit.obj      \
131+           $(SLO)$/jcmainct.obj    \
132+           $(SLO)$/jcmarker.obj    \
133+           $(SLO)$/jcmaster.obj    \
134+           $(SLO)$/jcomapi.obj     \
135+           $(SLO)$/jcparam.obj     \
136+           $(SLO)$/jcprepct.obj    \
137+           $(SLO)$/jcsample.obj    \
138+           $(SLO)$/jctrans.obj     \
139+           $(SLO)$/jdapimin.obj    \
140+           $(SLO)$/jdapistd.obj    \
141+           $(SLO)$/jdarith.obj     \
142+           $(SLO)$/jdatadst.obj    \
143+           $(SLO)$/jdatasrc.obj    \
144+           $(SLO)$/jdcoefct.obj    \
145+           $(SLO)$/jdcolor.obj     \
146+           $(SLO)$/jddctmgr.obj    \
147+           $(SLO)$/jdhuff.obj      \
148+           $(SLO)$/jdinput.obj     \
149+           $(SLO)$/jdmainct.obj    \
150+           $(SLO)$/jdmarker.obj    \
151+           $(SLO)$/jdmaster.obj    \
152+           $(SLO)$/jdmerge.obj     \
153+           $(SLO)$/jdpostct.obj    \
154+           $(SLO)$/jdsample.obj    \
155+           $(SLO)$/jdtrans.obj     \
156+           $(SLO)$/jerror.obj      \
157+           $(SLO)$/jfdctflt.obj    \
158+           $(SLO)$/jfdctfst.obj    \
159+           $(SLO)$/jfdctint.obj    \
160+           $(SLO)$/jidctflt.obj    \
161+           $(SLO)$/jidctfst.obj    \
162+           $(SLO)$/jidctint.obj    \
163+           $(SLO)$/jquant1.obj     \
164+           $(SLO)$/jquant2.obj     \
165+           $(SLO)$/jutils.obj      \
166+           $(SLO)$/jmemmgr.obj     \
167+           $(SLO)$/jmemnobs.obj    \
168+           $(SLO)$/jutils.obj
169+
170+LIB1TARGET=$(SLB)$/$(TARGET).lib
171+LIB1ARCHIV=$(LB)$/lib$(TARGET).a
172+LIB1OBJFILES=$(SLOFILES)
173+
174+.INCLUDE :  target.mk
175