diff dwt/internal/image/JPEGDecoder.d @ 246:fd9c62a2998e

Updater SWT 3.4M7 to 3.4
author Frank Benoit <benoit@tionex.de>
date Tue, 01 Jul 2008 10:15:59 +0200
parents 36f5cb12e1a2
children 0e2b4fed7a0f
line wrap: on
line diff
--- a/dwt/internal/image/JPEGDecoder.d	Tue Jul 01 08:58:50 2008 +0200
+++ b/dwt/internal/image/JPEGDecoder.d	Tue Jul 01 10:15:59 2008 +0200
@@ -243,7 +243,7 @@
          * You could suppress output of a table by setting this to true.
          * (See jpeg_suppress_tables for an example.)
          */
-        bool sent_table;        /* true when table has been output */
+        bool sent_table;     /* true when table has been output */
     }
 
     static final class JHUFF_TBL {
@@ -256,7 +256,7 @@
          * You could suppress output of a table by setting this to true.
          * (See jpeg_suppress_tables for an example.)
          */
-        bool sent_table;        /* true when table has been output */
+        bool sent_table;     /* true when table has been output */
     }
 
     static final class bitread_perm_state {     /* Bitreading state saved across MCUs */
@@ -374,7 +374,7 @@
 
         /* This is here to share code between baseline and progressive decoders; */
         /* other modules probably should not use it */
-        bool insufficient_data; /* set true after emitting warning */
+        bool insufficient_data;  /* set true after emitting warning */
 
         bitread_working_state br_state_local;
         savable_state state_local;
@@ -1280,7 +1280,7 @@
             return true;
         }
 
-        bool decode_mcu_DC_first (jpeg_decompress_struct cinfo, short[][] MCU_data) {    
+        bool decode_mcu_DC_first (jpeg_decompress_struct cinfo, short[][] MCU_data) {     
             phuff_entropy_decoder entropy = this;
             int Al = cinfo.Al;
             int s = 0, r;
@@ -1596,7 +1596,7 @@
          * components will be ignored (eg grayscale output from YCbCr image),
          * we can skip most computations for the unused components.
          */
-        bool component_needed;  /* do we need the value of this component? */
+        bool component_needed;   /* do we need the value of this component? */
 
         /* These values are computed before starting a scan of the component. */
         /* The decompressor output side may not use these variables. */
@@ -1634,7 +1634,7 @@
          * premultiplied as described above.    Since colormap indexes must fit into
          * JSAMPLEs, the entries of this array will too.
          */
-        bool is_padded;     /* is the colorindex padded for odither? */
+        bool is_padded;      /* is the colorindex padded for odither? */
 
         int[MAX_Q_COMPS] Ncolors;// = new int [MAX_Q_COMPS];    /* # of values alloced to each component */
 
@@ -1644,7 +1644,7 @@
 
         /* Variables for Floyd-Steinberg dithering */
 //          FSERRPTR fserrors[MAX_Q_COMPS]; /* accumulated errors */
-        bool on_odd_row;    
+        bool on_odd_row; 
 
         void start_pass (jpeg_decompress_struct cinfo, bool is_pre_scan) {
             error();
@@ -1661,7 +1661,7 @@
 //                   JDIMENSION *out_row_ctr,
 //                   JDIMENSION out_rows_avail));
 
-        bool need_context_rows; /* TRUE if need rows above & below */
+        bool need_context_rows;  /* TRUE if need rows above & below */
 
         /* Color conversion buffer. When using separate upsampling and color
          * conversion steps, this buffer holds one upsampled row group until it
@@ -1706,8 +1706,8 @@
         /* State of marker reader --- nominally internal, but applications
          * supplying COM or APPn handlers might like to know the state.
          */
-        bool saw_SOI;       /* found SOI? */
-        bool saw_SOF;       /* found SOF? */
+        bool saw_SOI;        /* found SOI? */
+        bool saw_SOF;        /* found SOF? */
         int next_restart_num;       /* next restart number expected (0-7) */
         int discarded_bytes;    /* # of bytes skipped looking for a marker */
 
@@ -1734,7 +1734,7 @@
         byte[][][MAX_COMPONENTS] buffer;// = new byte[MAX_COMPONENTS][][];
         int[MAX_COMPONENTS] buffer_offset;// = new int[MAX_COMPONENTS];
 
-        bool buffer_full;       /* Have we gotten an iMCU row from decoder? */
+        bool buffer_full;        /* Have we gotten an iMCU row from decoder? */
         int[1] rowgroup_ctr;// = new int[1];    /* counts row groups output to postprocessor */
 
         /* Remaining fields are only used in the context case. */
@@ -1958,10 +1958,10 @@
 
     static final class jpeg_input_controller {
         int consume_input;
-        bool has_multiple_scans;    /* True if file has multiple scans */
+        bool has_multiple_scans; /* True if file has multiple scans */
         bool eoi_reached;
 
-        bool inheaders;     /* true until first SOS is reached */
+        bool inheaders;      /* true until first SOS is reached */
     }
 
     static final class  jpeg_color_deconverter {
@@ -2050,7 +2050,7 @@
 //      struct jpeg_memory_mgr * mem;   /* Memory manager module */\
 //      struct jpeg_progress_mgr * progress; /* Progress monitor, or null if none */\
 //      void * client_data;     /* Available for use by application */\
-        bool is_decompressor;   /* So common code can tell which is which */
+        bool is_decompressor;    /* So common code can tell which is which */
         int global_state;       /* For checking call sequence validity */
 
 //      /* Source of compressed data */
@@ -2080,22 +2080,22 @@
 
         double output_gamma;        /* image gamma wanted in output */
 
-        bool buffered_image;    /* true=multiple output passes */
-        bool raw_data_out;      /* true=downsampled data wanted */
+        bool buffered_image; /* true=multiple output passes */
+        bool raw_data_out;       /* true=downsampled data wanted */
 
         int dct_method; /* IDCT algorithm selector */
-        bool do_fancy_upsampling;   /* true=apply fancy upsampling */
-        bool do_block_smoothing;    /* true=apply interblock smoothing */
-
-        bool quantize_colors;   /* true=colormapped output wanted */
+        bool do_fancy_upsampling;    /* true=apply fancy upsampling */
+        bool do_block_smoothing; /* true=apply interblock smoothing */
+
+        bool quantize_colors;    /* true=colormapped output wanted */
         /* the following are ignored if not quantize_colors: */
         int dither_mode;    /* type of color dithering to use */
-        bool two_pass_quantize; /* true=use two-pass color quantization */
+        bool two_pass_quantize;  /* true=use two-pass color quantization */
         int desired_number_of_colors;   /* max # colors to use in created colormap */
         /* these are significant only in buffered-image mode: */
-        bool enable_1pass_quant;    /* enable future use of 1-pass quantizer */
+        bool enable_1pass_quant; /* enable future use of 1-pass quantizer */
         bool enable_external_quant;/* enable future use of external colormap */
-        bool enable_2pass_quant;    /* enable future use of 2-pass quantizer */
+        bool enable_2pass_quant; /* enable future use of 2-pass quantizer */
 
         /* Description of actual output image that will be returned to application.
          * These fields are computed by jpeg_start_decompress().
@@ -2182,8 +2182,8 @@
         jpeg_component_info[] comp_info;
         /* comp_info[i] describes component that appears i'th in SOF */
 
-        bool progressive_mode;  /* true if SOFn specifies progressive mode */
-        bool arith_code;        /* true=arithmetic coding, false=Huffman */
+        bool progressive_mode;   /* true if SOFn specifies progressive mode */
+        bool arith_code;     /* true=arithmetic coding, false=Huffman */
 
         byte[NUM_ARITH_TBLS] arith_dc_L;// = new byte[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */
         byte[NUM_ARITH_TBLS] arith_dc_U;// = new byte[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */
@@ -2194,17 +2194,17 @@
         /* These fields record data obtained from optional markers recognized by
          * the JPEG library.
          */
-        bool saw_JFIF_marker;   /* true iff a JFIF APP0 marker was found */
+        bool saw_JFIF_marker;    /* true iff a JFIF APP0 marker was found */
         /* Data copied from JFIF marker; only valid if saw_JFIF_marker is true: */
         byte JFIF_major_version;    /* JFIF version number */
         byte JFIF_minor_version;
         byte density_unit;      /* JFIF code for pixel size units */
         short X_density;        /* Horizontal pixel density */
         short Y_density;        /* Vertical pixel density */
-        bool saw_Adobe_marker;  /* true iff an Adobe APP14 marker was found */
+        bool saw_Adobe_marker;   /* true iff an Adobe APP14 marker was found */
         byte Adobe_transform;   /* Color transform code from Adobe marker */
 
-        bool CCIR601_sampling;  /* true=first samples are cosited */
+        bool CCIR601_sampling;   /* true=first samples are cosited */
 
         /* Aside from the specific data retained from APPn markers known to the
          * library, the uninterpreted contents of any or all APPn and COM markers