jpeg headers corresponding to SDL version
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4708 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
@@ -45,11 +45,8 @@ JMESSAGE(JERR_BAD_ALIGN_TYPE, "ALIGN_TYPE is wrong, please fix")
|
||||
JMESSAGE(JERR_BAD_ALLOC_CHUNK, "MAX_ALLOC_CHUNK is wrong, please fix")
|
||||
JMESSAGE(JERR_BAD_BUFFER_MODE, "Bogus buffer control mode")
|
||||
JMESSAGE(JERR_BAD_COMPONENT_ID, "Invalid component ID %d in SOS")
|
||||
JMESSAGE(JERR_BAD_CROP_SPEC, "Invalid crop request")
|
||||
JMESSAGE(JERR_BAD_DCT_COEF, "DCT coefficient out of range")
|
||||
JMESSAGE(JERR_BAD_DCTSIZE, "IDCT output block size %d not supported")
|
||||
JMESSAGE(JERR_BAD_DROP_SAMPLING,
|
||||
"Component index %d: mismatching sampling ratio %d:%d, %d:%d, %c")
|
||||
JMESSAGE(JERR_BAD_HUFF_TABLE, "Bogus Huffman table definition")
|
||||
JMESSAGE(JERR_BAD_IN_COLORSPACE, "Bogus input colorspace")
|
||||
JMESSAGE(JERR_BAD_J_COLORSPACE, "Bogus JPEG colorspace")
|
||||
@@ -230,15 +227,6 @@ JMESSAGE(JWRN_TOO_MUCH_DATA, "Application transferred too many scanlines")
|
||||
(cinfo)->err->msg_parm.i[2] = (p3), \
|
||||
(cinfo)->err->msg_parm.i[3] = (p4), \
|
||||
(*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
|
||||
#define ERREXIT6(cinfo,code,p1,p2,p3,p4,p5,p6) \
|
||||
((cinfo)->err->msg_code = (code), \
|
||||
(cinfo)->err->msg_parm.i[0] = (p1), \
|
||||
(cinfo)->err->msg_parm.i[1] = (p2), \
|
||||
(cinfo)->err->msg_parm.i[2] = (p3), \
|
||||
(cinfo)->err->msg_parm.i[3] = (p4), \
|
||||
(cinfo)->err->msg_parm.i[4] = (p5), \
|
||||
(cinfo)->err->msg_parm.i[5] = (p6), \
|
||||
(*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
|
||||
#define ERREXITS(cinfo,code,str) \
|
||||
((cinfo)->err->msg_code = (code), \
|
||||
strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \
|
||||
|
||||
+13
-72
@@ -22,11 +22,6 @@
|
||||
|
||||
#define BITS_IN_JSAMPLE 8 /* use 8 or 12 */
|
||||
|
||||
#if (defined (_MSC_VER) && (_MSC_VER >= 800))
|
||||
#define HAVE_UNSIGNED_CHAR
|
||||
#define HAVE_ALL_INTS
|
||||
#define EXTERN(type) extern type __cdecl
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Maximum number of components (color channels) allowed in JPEG image.
|
||||
@@ -135,7 +130,6 @@ typedef char JOCTET;
|
||||
*/
|
||||
|
||||
/* UINT8 must hold at least the values 0..255. */
|
||||
#ifndef HAVE_ALL_INTS
|
||||
|
||||
#ifdef HAVE_UNSIGNED_CHAR
|
||||
typedef unsigned char UINT8;
|
||||
@@ -163,11 +157,13 @@ typedef short INT16;
|
||||
|
||||
/* INT32 must hold at least signed 32-bit values. */
|
||||
|
||||
#if !defined(XMD_H) && !defined(_WIN32) /* X11/xmd.h correctly defines INT32 */
|
||||
#ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
|
||||
#ifndef _BASETSD_H /* MinGW defines it in basetsd.h */
|
||||
#ifndef _BASETSD_H_ /* Microsoft defines it in basetsd.h */
|
||||
typedef long INT32;
|
||||
#endif
|
||||
|
||||
#endif /* HAVE_ALL_INTS */
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* Datatype used for image dimensions. The JPEG standard only supports
|
||||
* images up to 64K*64K due to 16-bit fields in SOF markers. Therefore
|
||||
@@ -188,63 +184,14 @@ typedef unsigned int JDIMENSION;
|
||||
* or code profilers that require it.
|
||||
*/
|
||||
|
||||
#ifdef _WIN32
|
||||
# if defined(ALL_STATIC)
|
||||
# if defined(JPEG_DLL)
|
||||
# undef JPEG_DLL
|
||||
# endif
|
||||
# if !defined(JPEG_STATIC)
|
||||
# define JPEG_STATIC
|
||||
# endif
|
||||
# endif
|
||||
# if defined(JPEG_DLL)
|
||||
# if defined(JPEG_STATIC)
|
||||
# undef JPEG_STATIC
|
||||
# endif
|
||||
# endif
|
||||
# if defined(JPEG_DLL)
|
||||
/* building a DLL */
|
||||
# define JPEG_IMPEXP __declspec(dllexport)
|
||||
# elif defined(JPEG_STATIC)
|
||||
/* building or linking to a static library */
|
||||
# define JPEG_IMPEXP
|
||||
# else
|
||||
/* linking to the DLL */
|
||||
# define JPEG_IMPEXP __declspec(dllimport)
|
||||
# endif
|
||||
# if !defined(JPEG_API)
|
||||
# define JPEG_API __cdecl
|
||||
# endif
|
||||
/* The only remaining magic that is necessary for cygwin */
|
||||
#elif defined(__CYGWIN__)
|
||||
# if !defined(JPEG_IMPEXP)
|
||||
# define JPEG_IMPEXP
|
||||
# endif
|
||||
# if !defined(JPEG_API)
|
||||
# define JPEG_API __cdecl
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* Ensure our magic doesn't hurt other platforms */
|
||||
#if !defined(JPEG_IMPEXP)
|
||||
# define JPEG_IMPEXP
|
||||
#endif
|
||||
#if !defined(JPEG_API)
|
||||
# define JPEG_API
|
||||
#endif
|
||||
|
||||
/* a function called through method pointers: */
|
||||
#define METHODDEF(type) static type
|
||||
#define METHODDEF(type) static type
|
||||
/* a function used only in its module: */
|
||||
#define LOCAL(type) static type
|
||||
#define LOCAL(type) static type
|
||||
/* a function referenced thru EXTERNs: */
|
||||
#define GLOBAL(type) type JPEG_API
|
||||
#define GLOBAL(type) type
|
||||
/* a reference to a GLOBAL function: */
|
||||
#ifndef EXTERN
|
||||
# define EXTERN(type) extern JPEG_IMPEXP type JPEG_API
|
||||
/* a reference to a "GLOBAL" function exported by sourcefiles of utility progs */
|
||||
#endif /* EXTERN */
|
||||
#define EXTERN_1(type) extern type JPEG_API
|
||||
#define EXTERN(type) extern type
|
||||
|
||||
|
||||
/* This macro is used to declare a "method", that is, a function pointer.
|
||||
@@ -266,16 +213,10 @@ typedef unsigned int JDIMENSION;
|
||||
* explicit coding is needed; see uses of the NEED_FAR_POINTERS symbol.
|
||||
*/
|
||||
|
||||
/* jmorecfg.h line 220 */
|
||||
/* HJH modification: several of the windows header files already define FAR
|
||||
because of this, the code below was changed so that it only tinkers with
|
||||
the FAR define if FAR is still undefined */
|
||||
#ifndef FAR
|
||||
#ifdef NEED_FAR_POINTERS
|
||||
#define FAR far
|
||||
#else
|
||||
#define FAR
|
||||
#endif
|
||||
#ifdef NEED_FAR_POINTERS
|
||||
#define FAR far
|
||||
#else
|
||||
#define FAR
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@@ -10,14 +10,6 @@
|
||||
* and perhaps jerror.h if they want to know the exact error codes.
|
||||
*/
|
||||
|
||||
|
||||
typedef unsigned char UINT8;
|
||||
typedef signed char INT8;
|
||||
typedef unsigned short UINT16;
|
||||
typedef short INT16;
|
||||
typedef unsigned UINT32;
|
||||
typedef int INT32;
|
||||
|
||||
#ifndef JPEGLIB_H
|
||||
#define JPEGLIB_H
|
||||
|
||||
@@ -37,9 +29,6 @@ extern "C" {
|
||||
#endif
|
||||
#include "jmorecfg.h" /* seldom changed options */
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
/* Version ID for the JPEG library.
|
||||
* Might be useful for tests like "#if JPEG_LIB_VERSION >= 60".
|
||||
@@ -100,7 +89,7 @@ typedef struct {
|
||||
* (not the zigzag order in which they are stored in a JPEG DQT marker).
|
||||
* CAUTION: IJG versions prior to v6a kept this array in zigzag order.
|
||||
*/
|
||||
unsigned int quantval[DCTSIZE2]; /* quantization step for each coefficient */
|
||||
UINT16 quantval[DCTSIZE2]; /* quantization step for each coefficient */
|
||||
/* This field is used only during compression. It's initialized FALSE when
|
||||
* the table is created, and set TRUE when it's been output to the file.
|
||||
* You could suppress output of a table by setting this to TRUE.
|
||||
@@ -1095,9 +1084,6 @@ struct jpeg_color_quantizer { long dummy; };
|
||||
#endif /* JPEG_INTERNALS */
|
||||
#endif /* INCOMPLETE_TYPES_BROKEN */
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* The JPEG library modules define JPEG_INTERNALS before including this file.
|
||||
|
||||
Reference in New Issue
Block a user