projects/dwt-linux: dwt/internal/image/JPEGDecoder.d comparison

comparison dwt/internal/image/JPEGDecoder.d @ 259:c0d810de7093

Update SWT 3.4M7 to 3.4

author	Frank Benoit <benoit@tionex.de>
date	Sun, 29 Jun 2008 14:33:38 +0200
parents	ce446666f5a2
children

comparison

equal deleted inserted replaced

-:cc1d3de0e80b
+:c0d810de7093
 /* 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.
 * (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 {
 /* These two fields directly represent the contents of a JPEG DHT marker */
 byte[17] bits;// = new byte[17]; /* bits[k] = # of symbols with codes of */
 /* 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.
 * (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 */
 int get_buffer; /* current bit-extraction buffer */
 int bits_left;      /* # of unused bits in it */
 abstract void start_pass (jpeg_decompress_struct cinfo);
 abstract bool decode_mcu (jpeg_decompress_struct cinfo, short[][] MCU_data);
 /* 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;
 public this(){
 br_state_local = new bitread_working_state();
 }
 }
 r = s >> 4;
 s &= 15;
 if (s !is 0) {
-if (s !is 1) {      /* size of new coef should always be 1 */
+if (s !is 1) {       /* size of new coef should always be 1 */
 //                              WARNMS(cinfo, JWRN_HUFF_BAD_CODE);
 }
 //                          CHECK_BIT_BUFFER(br_state, 1, goto undoit);
 {
 if (bits_left < (1)) {
 } else {
 if (r is 15) {  /* ZRL */
 k += 15;        /* skip 15 zeroes in band */
 } else {        /* EOBr, run length is 2^r + appended bits */
 EOBRUN = 1 << r;
-if (r !is 0) {      /* EOBr, r > 0 */
+if (r !is 0) {       /* EOBr, r > 0 */
 //                                  CHECK_BIT_BUFFER(br_state, r, return FALSE);
 {
 if (bits_left < (r)) {
 if (! jpeg_fill_bit_buffer(br_state,get_buffer,bits_left,r)) {
 return false;
 entropy.restarts_to_go--;
 return true;
 }
 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;
 int blkn, ci;
 short[] block;
 int downsampled_height; /* actual height in samples */
 /* This flag is used only for decompression.    In cases where some of the
 * 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. */
 int MCU_width;      /* number of blocks per MCU, horizontally */
 int MCU_height;     /* number of blocks per MCU, vertically */
 int[][] colorindex; /* Precomputed mapping for speed */
 /* colorindex[i][j] = index of color closest to pixel value j in component i,
 * 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 */
 /* Variables for ordered dithering */
 int row_index;      /* cur row's vertical index in dither matrix */
 //          ODITHER_MATRIX_PTR odither[MAX_Q_COMPS]; /* one dither array per component */
 /* Variables for Floyd-Steinberg dithering */
 //          FSERRPTR fserrors[MAX_Q_COMPS]; /* accumulated errors */
 bool on_odd_row;
 void start_pass (jpeg_decompress_struct cinfo, bool is_pre_scan) {
 error();
 }
 }
 //                   JDIMENSION in_row_groups_avail,
 //                   JSAMPARRAY output_buf,
 //                   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
 * has been color converted and output.
 * Note: we do not allocate any storage for component(s) which are full-size,
 //      jpeg_marker_parser_method read_restart_marker;
 /* 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_SOI;        /* found SOI? */
-bool saw_SOF;       /* found SOF? */
+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 */
 /* Application-overridable marker processing methods */
 //      jpeg_marker_parser_method process_COM;
 /* Pointer to allocated workspace (M or M+2 row groups). */
 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. */
 /* These are the master pointers to the funny-order pointer lists. */
 }
 }
 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 {
 //      JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
 int color_convert;
 static final class jpeg_decompress_struct {
 //      jpeg_error_mgr * err;   /* Error handler module */\
 //      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 */
 //      struct jpeg_source_mgr * src;
 InputStream inputStream;
 int scale_num, scale_denom; /* fraction by which to scale image */
 double output_gamma;        /* image gamma wanted in output */
-bool buffered_image;    /* true=multiple output passes */
+bool buffered_image; /* true=multiple output passes */
-bool raw_data_out;      /* true=downsampled data wanted */
+bool raw_data_out;       /* true=downsampled data wanted */
 int dct_method; /* IDCT algorithm selector */
-bool do_fancy_upsampling;   /* true=apply fancy upsampling */
+bool do_fancy_upsampling;    /* true=apply fancy upsampling */
-bool do_block_smoothing;    /* true=apply interblock smoothing */
+bool do_block_smoothing; /* true=apply interblock smoothing */
-bool quantize_colors;   /* true=colormapped output wanted */
+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().
 * You can also use jpeg_calc_output_dimensions() to determine these values
 * in advance of calling jpeg_start_decompress().
 int data_precision;     /* bits of precision in image data */
 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 progressive_mode;   /* true if SOFn specifies progressive mode */
-bool arith_code;        /* true=arithmetic coding, false=Huffman */
+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 */
 byte[NUM_ARITH_TBLS] arith_ac_K;// = new byte[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */
 int restart_interval; /* MCUs per restart interval, or 0 for no restart */
 /* 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
 * can be saved in a list for examination by the application.
 */
 huffval[i] = cinfo.buffer[cinfo.bytes_offset++];
 }
 length -= count;
-if ((index & 0x10) !is 0) {     /* AC table definition */
+if ((index & 0x10) !is 0) {      /* AC table definition */
 index -= 0x10;
 htblptr = cinfo.ac_huff_tbl_ptrs[index] = new JHUFF_TBL();
 } else {            /* DC table definition */
 htblptr = cinfo.dc_huff_tbl_ptrs[index] = new JHUFF_TBL();
 }
 if (((data[12] & 0xFF) | (data[13]) & 0xFF) !is 0) {
 //          TRACEMS2(cinfo, 1, JTRC_JFIF_THUMBNAIL,
 //               GETJOCTET(data[12]), GETJOCTET(data[13]));
 }
 totallen -= APP0_DATA_LEN;
-if (totallen !is    ((data[12] & 0xFF) * (data[13] & 0xFF) * 3)) {
+if (totallen !is ((data[12] & 0xFF) * (data[13] & 0xFF) * 3)) {
 //          TRACEMS1(cinfo, 1, JTRC_JFIF_BADTHUMBNAILSIZE, cast(int) totallen);
 }
 } else if (datalen >= 6 &&
 (data[0] & 0xFF) is 0x4A &&
 (data[1] & 0xFF) is 0x46 &&

Mercurial > projects > dwt-linux

comparison dwt/internal/image/JPEGDecoder.d @ 259:c0d810de7093