ENH: Created a new local dir libijg (from libijg8), then went on the server copy...

[gdcm.git] / src / jpeg / libijg / jmorecfg.h

diff --git a/src/jpeg/libijg/jmorecfg.h b/src/jpeg/libijg/jmorecfg.h
index dd0f188d014c73db8d906625326f08d52cf0c676..1f59794312d9edeb7c4044e32a9734c6efc7498d 100644 (file)
--- a/src/jpeg/libijg/jmorecfg.h
+++ b/src/jpeg/libijg/jmorecfg.h
@@ -19,7 +19,8 @@
  * We do not support run-time selection of data precision, sorry.
  */
 
-#define BITS_IN_JSAMPLE  8     /* use 8 or 12 */
+//#define BITS_IN_JSAMPLE  8  /* use 8 or 12 */
+#define BITS_IN_JSAMPLE @GDCM_BITS_IN_JSAMPLE@
 
 /*
  * Maximum number of components (color channels) allowed in JPEG image.
@@ -30,7 +31,7 @@
  * bytes of storage, whether actually used in an image or not.)
  */
 
-#define MAX_COMPONENTS  10     /* maximum number of image components */
+#define MAX_COMPONENTS  10  /* maximum number of image components */
 
 
 /*
@@ -68,8 +69,8 @@ typedef char JSAMPLE;
 
 #endif /* HAVE_UNSIGNED_CHAR */
 
-#define MAXJSAMPLE     255
-#define CENTERJSAMPLE  128
+#define MAXJSAMPLE  255
+#define CENTERJSAMPLE  128
 
 #endif /* BITS_IN_JSAMPLE == 8 */
 
@@ -82,8 +83,8 @@ typedef char JSAMPLE;
 typedef short JSAMPLE;
 #define GETJSAMPLE(value)  ((int) (value))
 
-#define MAXJSAMPLE     4095
-#define CENTERJSAMPLE  2048
+#define MAXJSAMPLE  4095
+#define CENTERJSAMPLE  2048
 
 #endif /* BITS_IN_JSAMPLE == 12 */
 
@@ -149,13 +150,13 @@ typedef unsigned int UINT16;
 
 /* INT16 must hold at least the values -32768..32767. */
 
-#ifndef XMD_H                  /* X11/xmd.h correctly defines INT16 */
+#ifndef XMD_H      /* X11/xmd.h correctly defines INT16 */
 typedef short INT16;
 #endif
 
 /* INT32 must hold at least signed 32-bit values. */
 
-#ifndef XMD_H                  /* X11/xmd.h correctly defines INT32 */
+#ifndef XMD_H      /* X11/xmd.h correctly defines INT32 */
 typedef long INT32;
 #endif
 
@@ -179,20 +180,20 @@ typedef unsigned int JDIMENSION;
  */
 
 /* 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: */
 #ifdef WIN32
-  #define GLOBAL(type)         __declspec( dllexport ) type
+  #define GLOBAL(type)    __declspec( dllexport ) type
 #else
-  #define GLOBAL(type)         type
+  #define GLOBAL(type)    type
 #endif
 /* a reference to a GLOBAL function: */
 #ifdef WIN32
-  #define EXTERN(type)         extern __declspec( dllexport ) type
+  #define EXTERN(type)    extern __declspec( dllexport ) type
 #else
-  #define EXTERN(type)         extern type
+  #define EXTERN(type)    extern type
 #endif
 
 
@@ -232,11 +233,11 @@ typedef unsigned int JDIMENSION;
 #ifndef HAVE_BOOLEAN
 typedef int boolean;
 #endif
-#ifndef FALSE                  /* in case these macros already exist */
-#define FALSE  0               /* values of boolean */
+#ifndef FALSE      /* in case these macros already exist */
+#define FALSE  0    /* values of boolean */
 #endif
 #ifndef TRUE
-#define TRUE   1
+#define TRUE  1
 #endif
 
 
@@ -266,16 +267,16 @@ typedef int boolean;
 
 /* Capability options common to encoder and decoder: */
 
-#define DCT_ISLOW_SUPPORTED    /* slow but accurate integer algorithm */
-#define DCT_IFAST_SUPPORTED    /* faster, less accurate integer method */
-#define DCT_FLOAT_SUPPORTED    /* floating-point: accurate, fast on fast HW */
+#define DCT_ISLOW_SUPPORTED  /* slow but accurate integer algorithm */
+#define DCT_IFAST_SUPPORTED  /* faster, less accurate integer method */
+#define DCT_FLOAT_SUPPORTED  /* floating-point: accurate, fast on fast HW */
 
 /* Encoder capability options: */
 
 #undef  C_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
 #define C_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
-#define C_PROGRESSIVE_SUPPORTED            /* Progressive JPEG? (Requires MULTISCAN)*/
-#define ENTROPY_OPT_SUPPORTED      /* Optimization of entropy coding parms? */
+#define C_PROGRESSIVE_SUPPORTED      /* Progressive JPEG? (Requires MULTISCAN)*/
+#define ENTROPY_OPT_SUPPORTED      /* Optimization of entropy coding parms? */
 /* Note: if you selected 12-bit data precision, it is dangerous to turn off
  * ENTROPY_OPT_SUPPORTED.  The standard Huffman tables are only good for 8-bit
  * precision, so jchuff.c normally uses entropy optimization to compute
@@ -290,14 +291,14 @@ typedef int boolean;
 
 #undef  D_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
 #define D_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
-#define D_PROGRESSIVE_SUPPORTED            /* Progressive JPEG? (Requires MULTISCAN)*/
-#define SAVE_MARKERS_SUPPORTED     /* jpeg_save_markers() needed? */
+#define D_PROGRESSIVE_SUPPORTED      /* Progressive JPEG? (Requires MULTISCAN)*/
+#define SAVE_MARKERS_SUPPORTED      /* jpeg_save_markers() needed? */
 #define BLOCK_SMOOTHING_SUPPORTED   /* Block smoothing? (Progressive only) */
-#define IDCT_SCALING_SUPPORTED     /* Output rescaling via IDCT? */
+#define IDCT_SCALING_SUPPORTED      /* Output rescaling via IDCT? */
 #undef  UPSAMPLE_SCALING_SUPPORTED  /* Output rescaling at upsample stage? */
 #define UPSAMPLE_MERGING_SUPPORTED  /* Fast path for sloppy upsampling? */
-#define QUANT_1PASS_SUPPORTED      /* 1-pass color quantization? */
-#define QUANT_2PASS_SUPPORTED      /* 2-pass color quantization? */
+#define QUANT_1PASS_SUPPORTED      /* 1-pass color quantization? */
+#define QUANT_2PASS_SUPPORTED      /* 2-pass color quantization? */
 
 /* more capability options later, no doubt */
 
@@ -317,10 +318,10 @@ typedef int boolean;
  *    can't use color quantization if you change that value.
  */
 
-#define RGB_RED                0       /* Offset of Red in an RGB scanline element */
-#define RGB_GREEN      1       /* Offset of Green */
-#define RGB_BLUE       2       /* Offset of Blue */
-#define RGB_PIXELSIZE  3       /* JSAMPLEs per RGB scanline element */
+#define RGB_RED    0  /* Offset of Red in an RGB scanline element */
+#define RGB_GREEN  1  /* Offset of Green */
+#define RGB_BLUE  2  /* Offset of Blue */
+#define RGB_PIXELSIZE  3  /* JSAMPLEs per RGB scanline element */
 
 
 /* Definitions for speed-related optimizations. */
@@ -331,11 +332,11 @@ typedef int boolean;
  */
 
 #ifndef INLINE
-#ifdef __GNUC__                        /* for instance, GNU C knows about inline */
+#ifdef __GNUC__      /* for instance, GNU C knows about inline */
 #define INLINE __inline__
 #endif
 #ifndef INLINE
-#define INLINE                 /* default is to define it as empty */
+#define INLINE      /* default is to define it as empty */
 #endif
 #endif
 
@@ -346,7 +347,7 @@ typedef int boolean;
  */
 
 #ifndef MULTIPLIER
-#define MULTIPLIER  int                /* type for fastest integer multiply */
+#define MULTIPLIER  int    /* type for fastest integer multiply */
 #endif