Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(344)

Side by Side Diff: third_party/libjpeg_turbo/jmorecfg.h

Issue 7508009: Fix Windows build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/
Patch Set: '' Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « third_party/libjpeg_turbo/google.patch ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * jmorecfg.h 2 * jmorecfg.h
3 * 3 *
4 * Copyright (C) 1991-1997, Thomas G. Lane. 4 * Copyright (C) 1991-1997, Thomas G. Lane.
5 * Copyright (C) 2009, D. R. Commander. 5 * Copyright (C) 2009, D. R. Commander.
6 * This file is part of the Independent JPEG Group's software. 6 * This file is part of the Independent JPEG Group's software.
7 * For conditions of distribution and use, see the accompanying README file. 7 * For conditions of distribution and use, see the accompanying README file.
8 * 8 *
9 * This file contains additional configuration options that customize the 9 * This file contains additional configuration options that customize the
10 * JPEG software for special applications or support machine-dependent 10 * JPEG software for special applications or support machine-dependent
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 146
147 #ifdef HAVE_UNSIGNED_SHORT 147 #ifdef HAVE_UNSIGNED_SHORT
148 typedef unsigned short UINT16; 148 typedef unsigned short UINT16;
149 #else /* not HAVE_UNSIGNED_SHORT */ 149 #else /* not HAVE_UNSIGNED_SHORT */
150 typedef unsigned int UINT16; 150 typedef unsigned int UINT16;
151 #endif /* HAVE_UNSIGNED_SHORT */ 151 #endif /* HAVE_UNSIGNED_SHORT */
152 152
153 /* INT16 must hold at least the values -32768..32767. */ 153 /* INT16 must hold at least the values -32768..32767. */
154 154
155 #ifndef XMD_H /* X11/xmd.h correctly defines INT16 */ 155 #ifndef XMD_H /* X11/xmd.h correctly defines INT16 */
156 #ifndef _BASETSD_H_ /* basetsd.h correctly defines INT32 */
156 typedef short INT16; 157 typedef short INT16;
157 #endif 158 #endif
159 #endif
158 160
159 /* INT32 must hold at least signed 32-bit values. */ 161 /* INT32 must hold at least signed 32-bit values. */
160 162
161 #ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ 163 #ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
164 #ifndef _BASETSD_H_ /* basetsd.h correctly defines INT32 */
162 typedef long INT32; 165 typedef long INT32;
163 #endif 166 #endif
167 #endif
164 168
165 /* Datatype used for image dimensions. The JPEG standard only supports 169 /* Datatype used for image dimensions. The JPEG standard only supports
166 * images up to 64K*64K due to 16-bit fields in SOF markers. Therefore 170 * images up to 64K*64K due to 16-bit fields in SOF markers. Therefore
167 * "unsigned int" is sufficient on all machines. However, if you need to 171 * "unsigned int" is sufficient on all machines. However, if you need to
168 * handle larger images and you don't mind deviating from the spec, you 172 * handle larger images and you don't mind deviating from the spec, you
169 * can change this datatype. 173 * can change this datatype.
170 */ 174 */
171 175
172 typedef unsigned int JDIMENSION; 176 typedef unsigned int JDIMENSION;
173 177
(...skipping 29 matching lines...) Expand all
203 #define JMETHOD(type,methodname,arglist) type (*methodname) () 207 #define JMETHOD(type,methodname,arglist) type (*methodname) ()
204 #endif 208 #endif
205 209
206 210
207 /* Here is the pseudo-keyword for declaring pointers that must be "far" 211 /* Here is the pseudo-keyword for declaring pointers that must be "far"
208 * on 80x86 machines. Most of the specialized coding for 80x86 is handled 212 * on 80x86 machines. Most of the specialized coding for 80x86 is handled
209 * by just saying "FAR *" where such a pointer is needed. In a few places 213 * by just saying "FAR *" where such a pointer is needed. In a few places
210 * explicit coding is needed; see uses of the NEED_FAR_POINTERS symbol. 214 * explicit coding is needed; see uses of the NEED_FAR_POINTERS symbol.
211 */ 215 */
212 216
217 #ifndef FAR
213 #ifdef NEED_FAR_POINTERS 218 #ifdef NEED_FAR_POINTERS
214 #define FAR far 219 #define FAR far
215 #else 220 #else
216 #define FAR 221 #define FAR
217 #endif 222 #endif
223 #endif
218 224
219 225
220 /* 226 /*
221 * On a few systems, type boolean and/or its values FALSE, TRUE may appear 227 * On a few systems, type boolean and/or its values FALSE, TRUE may appear
222 * in standard header files. Or you may have conflicts with application- 228 * in standard header files. Or you may have conflicts with application-
223 * specific header files that you want to include together with these files. 229 * specific header files that you want to include together with these files.
224 * Defining HAVE_BOOLEAN before including jpeglib.h should make it work. 230 * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
225 */ 231 */
226 232
227 #ifndef HAVE_BOOLEAN 233 #ifndef HAVE_BOOLEAN
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 363
358 #ifndef FAST_FLOAT 364 #ifndef FAST_FLOAT
359 #ifdef HAVE_PROTOTYPES 365 #ifdef HAVE_PROTOTYPES
360 #define FAST_FLOAT float 366 #define FAST_FLOAT float
361 #else 367 #else
362 #define FAST_FLOAT double 368 #define FAST_FLOAT double
363 #endif 369 #endif
364 #endif 370 #endif
365 371
366 #endif /* JPEG_INTERNAL_OPTIONS */ 372 #endif /* JPEG_INTERNAL_OPTIONS */
OLDNEW
« no previous file with comments | « third_party/libjpeg_turbo/google.patch ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698