X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fjpeg%2Flibijg%2Fjdcoefct.c;h=2e5ec1100c0d3a3fa8a9b6aa927078a20fbd5671;hb=c4220b95e9d5e902a7468e408435bf6dea4950eb;hp=4938d20fcb655632d640534ba19e73f0c8fdccbc;hpb=a26e6f06a76ec85504cf65288e7c47f2cd728641;p=gdcm.git

diff --git a/src/jpeg/libijg/jdcoefct.c b/src/jpeg/libijg/jdcoefct.c
index 4938d20f..2e5ec110 100644
--- a/src/jpeg/libijg/jdcoefct.c
+++ b/src/jpeg/libijg/jdcoefct.c
@@ -1,12 +1,12 @@
 /*
  * jdcoefct.c
  *
- * Copyright (C) 1994-1997, Thomas G. Lane.
+ * Copyright (C) 1994-1998, Thomas G. Lane.
  * This file is part of the Independent JPEG Group's software.
  * For conditions of distribution and use, see the accompanying README file.
  *
  * This file contains the coefficient buffer controller for decompression.
- * This controller is the top level of the JPEG decompressor proper.
+ * This controller is the top level of the lossy JPEG decompressor proper.
  * The coefficient buffer lies between entropy decoding and inverse-DCT steps.
  *
  * In buffered-image mode, this controller is the interface between
@@ -17,6 +17,7 @@
 #define JPEG_INTERNALS
 #include "jinclude.h"
 #include "jpeglib.h"
+#include "jlossy.h"
 
 /* Block smoothing is only applicable for progressive JPEG, so: */
 #ifndef D_PROGRESSIVE_SUPPORTED
@@ -26,18 +27,16 @@
 /* Private buffer controller object */
 
 typedef struct {
-  struct jpeg_d_coef_controller pub; /* public fields */
-
   /* These variables keep track of the current location of the input side. */
   /* cinfo->input_iMCU_row is also used for this. */
-  JDIMENSION MCU_ctr;		/* counts MCUs processed in current row */
-  int MCU_vert_offset;		/* counts MCU rows within iMCU row */
-  int MCU_rows_per_iMCU_row;	/* number of such rows needed */
+  JDIMENSION MCU_ctr;    /* counts MCUs processed in current row */
+  int MCU_vert_offset;    /* counts MCU rows within iMCU row */
+  int MCU_rows_per_iMCU_row;  /* number of such rows needed */
 
   /* The output side's location is represented by cinfo->output_iMCU_row. */
 
   /* In single-pass modes, it's sufficient to buffer just one MCU.
-   * We allocate a workspace of D_MAX_BLOCKS_IN_MCU coefficient blocks,
+   * We allocate a workspace of D_MAX_DATA_UNITS_IN_MCU coefficient blocks,
    * and let the entropy decoder write into that workspace each time.
    * (On 80x86, the workspace is FAR even though it's not really very big;
    * this is to keep the module interfaces unchanged when a large coefficient
@@ -45,7 +44,7 @@ typedef struct {
    * In multi-pass modes, this array points to the current MCU's blocks
    * within the virtual arrays; it is used only by the input side.
    */
-  JBLOCKROW MCU_buffer[D_MAX_BLOCKS_IN_MCU];
+  JBLOCKROW MCU_buffer[D_MAX_DATA_UNITS_IN_MCU];
 
 #ifdef D_MULTISCAN_FILES_SUPPORTED
   /* In multi-pass modes, we need a virtual block array for each component. */
@@ -55,23 +54,23 @@ typedef struct {
 #ifdef BLOCK_SMOOTHING_SUPPORTED
   /* When doing block smoothing, we latch coefficient Al values here */
   int * coef_bits_latch;
-#define SAVED_COEFS  6		/* we save coef_bits[0..5] */
+#define SAVED_COEFS  6    /* we save coef_bits[0..5] */
 #endif
-} my_coef_controller;
+} d_coef_controller;
 
-typedef my_coef_controller * my_coef_ptr;
+typedef d_coef_controller * d_coef_ptr;
 
 /* Forward declarations */
 METHODDEF(int) decompress_onepass
-	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
+  JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
 #ifdef D_MULTISCAN_FILES_SUPPORTED
 METHODDEF(int) decompress_data
-	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
+  JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
 #endif
 #ifdef BLOCK_SMOOTHING_SUPPORTED
 LOCAL(boolean) smoothing_ok JPP((j_decompress_ptr cinfo));
 METHODDEF(int) decompress_smooth_data
-	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
+  JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
 #endif
 
 
@@ -79,7 +78,8 @@ LOCAL(void)
 start_iMCU_row (j_decompress_ptr cinfo)
 /* Reset within-iMCU-row counters for a new row (input side) */
 {
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  d_coef_ptr coef = (d_coef_ptr) lossyd->coef_private;
 
   /* In an interleaved scan, an MCU row is the same as an iMCU row.
    * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.
@@ -119,14 +119,15 @@ METHODDEF(void)
 start_output_pass (j_decompress_ptr cinfo)
 {
 #ifdef BLOCK_SMOOTHING_SUPPORTED
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  /* d_coef_ptr coef = (d_coef_ptr) lossyd->coef_private; */
 
   /* If multipass, check to see whether to use block smoothing on this pass */
-  if (coef->pub.coef_arrays != NULL) {
+  if (lossyd->coef_arrays != NULL) {
     if (cinfo->do_block_smoothing && smoothing_ok(cinfo))
-      coef->pub.decompress_data = decompress_smooth_data;
+      lossyd->pub.decompress_data = decompress_smooth_data;
     else
-      coef->pub.decompress_data = decompress_data;
+      lossyd->pub.decompress_data = decompress_data;
   }
 #endif
   cinfo->output_iMCU_row = 0;
@@ -146,8 +147,9 @@ start_output_pass (j_decompress_ptr cinfo)
 METHODDEF(int)
 decompress_onepass (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
 {
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  JDIMENSION MCU_col_num;	/* index of current MCU within row */
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  d_coef_ptr coef = (d_coef_ptr) lossyd->coef_private;
+  JDIMENSION MCU_col_num;  /* index of current MCU within row */
   JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;
   JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
   int blkn, ci, xindex, yindex, yoffset, useful_width;
@@ -160,49 +162,49 @@ decompress_onepass (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
   for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
        yoffset++) {
     for (MCU_col_num = coef->MCU_ctr; MCU_col_num <= last_MCU_col;
-	 MCU_col_num++) {
+   MCU_col_num++) {
       /* Try to fetch an MCU.  Entropy decoder expects buffer to be zeroed. */
       jzero_far((void FAR *) coef->MCU_buffer[0],
-		(size_t) (cinfo->blocks_in_MCU * SIZEOF(JBLOCK)));
-      if (! (*cinfo->entropy->decode_mcu) (cinfo, coef->MCU_buffer)) {
-	/* Suspension forced; update state counters and exit */
-	coef->MCU_vert_offset = yoffset;
-	coef->MCU_ctr = MCU_col_num;
-	return JPEG_SUSPENDED;
+    (size_t) (cinfo->data_units_in_MCU * SIZEOF(JBLOCK)));
+      if (! (*lossyd->entropy_decode_mcu) (cinfo, coef->MCU_buffer)) {
+  /* Suspension forced; update state counters and exit */
+  coef->MCU_vert_offset = yoffset;
+  coef->MCU_ctr = MCU_col_num;
+  return JPEG_SUSPENDED;
       }
       /* Determine where data should go in output_buf and do the IDCT thing.
        * We skip dummy blocks at the right and bottom edges (but blkn gets
        * incremented past them!).  Note the inner loop relies on having
        * allocated the MCU_buffer[] blocks sequentially.
        */
-      blkn = 0;			/* index of current DCT block within MCU */
+      blkn = 0;      /* index of current DCT block within MCU */
       for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-	compptr = cinfo->cur_comp_info[ci];
-	/* Don't bother to IDCT an uninteresting component. */
-	if (! compptr->component_needed) {
-	  blkn += compptr->MCU_blocks;
-	  continue;
-	}
-	inverse_DCT = cinfo->idct->inverse_DCT[compptr->component_index];
-	useful_width = (MCU_col_num < last_MCU_col) ? compptr->MCU_width
-						    : compptr->last_col_width;
-	output_ptr = output_buf[compptr->component_index] +
-	  yoffset * compptr->DCT_scaled_size;
-	start_col = MCU_col_num * compptr->MCU_sample_width;
-	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
-	  if (cinfo->input_iMCU_row < last_iMCU_row ||
-	      yoffset+yindex < compptr->last_row_height) {
-	    output_col = start_col;
-	    for (xindex = 0; xindex < useful_width; xindex++) {
-	      (*inverse_DCT) (cinfo, compptr,
-			      (JCOEFPTR) coef->MCU_buffer[blkn+xindex],
-			      output_ptr, output_col);
-	      output_col += compptr->DCT_scaled_size;
-	    }
-	  }
-	  blkn += compptr->MCU_width;
-	  output_ptr += compptr->DCT_scaled_size;
-	}
+  compptr = cinfo->cur_comp_info[ci];
+  /* Don't bother to IDCT an uninteresting component. */
+  if (! compptr->component_needed) {
+    blkn += compptr->MCU_data_units;
+    continue;
+  }
+  inverse_DCT = lossyd->inverse_DCT[compptr->component_index];
+  useful_width = (MCU_col_num < last_MCU_col) ? compptr->MCU_width
+                : compptr->last_col_width;
+  output_ptr = output_buf[compptr->component_index] +
+    yoffset * compptr->codec_data_unit;
+  start_col = MCU_col_num * compptr->MCU_sample_width;
+  for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
+    if (cinfo->input_iMCU_row < last_iMCU_row ||
+        yoffset+yindex < compptr->last_row_height) {
+      output_col = start_col;
+      for (xindex = 0; xindex < useful_width; xindex++) {
+        (*inverse_DCT) (cinfo, compptr,
+            (JCOEFPTR) coef->MCU_buffer[blkn+xindex],
+            output_ptr, output_col);
+        output_col += compptr->codec_data_unit;
+      }
+    }
+    blkn += compptr->MCU_width;
+    output_ptr += compptr->codec_data_unit;
+  }
       }
     }
     /* Completed an MCU row, but perhaps not an iMCU row */
@@ -227,7 +229,8 @@ decompress_onepass (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
 METHODDEF(int)
 dummy_consume_data (j_decompress_ptr cinfo)
 {
-  return JPEG_SUSPENDED;	/* Always indicate nothing was done */
+  (void)cinfo;
+  return JPEG_SUSPENDED;  /* Always indicate nothing was done */
 }
 
 
@@ -243,8 +246,9 @@ dummy_consume_data (j_decompress_ptr cinfo)
 METHODDEF(int)
 consume_data (j_decompress_ptr cinfo)
 {
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  JDIMENSION MCU_col_num;	/* index of current MCU within row */
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  d_coef_ptr coef = (d_coef_ptr) lossyd->coef_private;
+  JDIMENSION MCU_col_num;  /* index of current MCU within row */
   int blkn, ci, xindex, yindex, yoffset;
   JDIMENSION start_col;
   JBLOCKARRAY buffer[MAX_COMPS_IN_SCAN];
@@ -268,25 +272,25 @@ consume_data (j_decompress_ptr cinfo)
   for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
        yoffset++) {
     for (MCU_col_num = coef->MCU_ctr; MCU_col_num < cinfo->MCUs_per_row;
-	 MCU_col_num++) {
+   MCU_col_num++) {
       /* Construct list of pointers to DCT blocks belonging to this MCU */
-      blkn = 0;			/* index of current DCT block within MCU */
+      blkn = 0;      /* index of current DCT block within MCU */
       for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-	compptr = cinfo->cur_comp_info[ci];
-	start_col = MCU_col_num * compptr->MCU_width;
-	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
-	  buffer_ptr = buffer[ci][yindex+yoffset] + start_col;
-	  for (xindex = 0; xindex < compptr->MCU_width; xindex++) {
-	    coef->MCU_buffer[blkn++] = buffer_ptr++;
-	  }
-	}
+  compptr = cinfo->cur_comp_info[ci];
+  start_col = MCU_col_num * compptr->MCU_width;
+  for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
+    buffer_ptr = buffer[ci][yindex+yoffset] + start_col;
+    for (xindex = 0; xindex < compptr->MCU_width; xindex++) {
+      coef->MCU_buffer[blkn++] = buffer_ptr++;
+    }
+  }
       }
       /* Try to fetch the MCU. */
-      if (! (*cinfo->entropy->decode_mcu) (cinfo, coef->MCU_buffer)) {
-	/* Suspension forced; update state counters and exit */
-	coef->MCU_vert_offset = yoffset;
-	coef->MCU_ctr = MCU_col_num;
-	return JPEG_SUSPENDED;
+      if (! (*lossyd->entropy_decode_mcu) (cinfo, coef->MCU_buffer)) {
+  /* Suspension forced; update state counters and exit */
+  coef->MCU_vert_offset = yoffset;
+  coef->MCU_ctr = MCU_col_num;
+  return JPEG_SUSPENDED;
       }
     }
     /* Completed an MCU row, but perhaps not an iMCU row */
@@ -314,7 +318,8 @@ consume_data (j_decompress_ptr cinfo)
 METHODDEF(int)
 decompress_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
 {
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  d_coef_ptr coef = (d_coef_ptr) lossyd->coef_private;
   JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
   JDIMENSION block_num;
   int ci, block_row, block_rows;
@@ -327,8 +332,8 @@ decompress_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
 
   /* Force some input to be done if we are getting ahead of the input. */
   while (cinfo->input_scan_number < cinfo->output_scan_number ||
-	 (cinfo->input_scan_number == cinfo->output_scan_number &&
-	  cinfo->input_iMCU_row <= cinfo->output_iMCU_row)) {
+   (cinfo->input_scan_number == cinfo->output_scan_number &&
+    cinfo->input_iMCU_row <= cinfo->output_iMCU_row)) {
     if ((*cinfo->inputctl->consume_input)(cinfo) == JPEG_SUSPENDED)
       return JPEG_SUSPENDED;
   }
@@ -349,22 +354,22 @@ decompress_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
       block_rows = compptr->v_samp_factor;
     else {
       /* NB: can't use last_row_height here; it is input-side-dependent! */
-      block_rows = (int) (compptr->height_in_blocks % compptr->v_samp_factor);
+      block_rows = (int) (compptr->height_in_data_units % compptr->v_samp_factor);
       if (block_rows == 0) block_rows = compptr->v_samp_factor;
     }
-    inverse_DCT = cinfo->idct->inverse_DCT[ci];
+    inverse_DCT = lossyd->inverse_DCT[ci];
     output_ptr = output_buf[ci];
     /* Loop over all DCT blocks to be processed. */
     for (block_row = 0; block_row < block_rows; block_row++) {
       buffer_ptr = buffer[block_row];
       output_col = 0;
-      for (block_num = 0; block_num < compptr->width_in_blocks; block_num++) {
-	(*inverse_DCT) (cinfo, compptr, (JCOEFPTR) buffer_ptr,
-			output_ptr, output_col);
-	buffer_ptr++;
-	output_col += compptr->DCT_scaled_size;
+      for (block_num = 0; block_num < compptr->width_in_data_units; block_num++) {
+  (*inverse_DCT) (cinfo, compptr, (JCOEFPTR) buffer_ptr,
+      output_ptr, output_col);
+  buffer_ptr++;
+  output_col += compptr->codec_data_unit;
       }
-      output_ptr += compptr->DCT_scaled_size;
+      output_ptr += compptr->codec_data_unit;
     }
   }
 
@@ -404,7 +409,8 @@ decompress_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
 LOCAL(boolean)
 smoothing_ok (j_decompress_ptr cinfo)
 {
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  d_coef_ptr coef = (d_coef_ptr) lossyd->coef_private;
   boolean smoothing_useful = FALSE;
   int ci, coefi;
   jpeg_component_info *compptr;
@@ -412,15 +418,15 @@ smoothing_ok (j_decompress_ptr cinfo)
   int * coef_bits;
   int * coef_bits_latch;
 
-  if (! cinfo->progressive_mode || cinfo->coef_bits == NULL)
+  if (! cinfo->process == JPROC_PROGRESSIVE || cinfo->coef_bits == NULL)
     return FALSE;
 
   /* Allocate latch area if not already done */
   if (coef->coef_bits_latch == NULL)
     coef->coef_bits_latch = (int *)
       (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  cinfo->num_components *
-				  (SAVED_COEFS * SIZEOF(int)));
+          cinfo->num_components *
+          (SAVED_COEFS * SIZEOF(int)));
   coef_bits_latch = coef->coef_bits_latch;
 
   for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
@@ -430,11 +436,11 @@ smoothing_ok (j_decompress_ptr cinfo)
       return FALSE;
     /* Verify DC & first 5 AC quantizers are nonzero to avoid zero-divide. */
     if (qtable->quantval[0] == 0 ||
-	qtable->quantval[Q01_POS] == 0 ||
-	qtable->quantval[Q10_POS] == 0 ||
-	qtable->quantval[Q20_POS] == 0 ||
-	qtable->quantval[Q11_POS] == 0 ||
-	qtable->quantval[Q02_POS] == 0)
+  qtable->quantval[Q01_POS] == 0 ||
+  qtable->quantval[Q10_POS] == 0 ||
+  qtable->quantval[Q20_POS] == 0 ||
+  qtable->quantval[Q11_POS] == 0 ||
+  qtable->quantval[Q02_POS] == 0)
       return FALSE;
     /* DC values must be at least partly known for all components. */
     coef_bits = cinfo->coef_bits[ci];
@@ -444,7 +450,7 @@ smoothing_ok (j_decompress_ptr cinfo)
     for (coefi = 1; coefi <= 5; coefi++) {
       coef_bits_latch[coefi] = coef_bits[coefi];
       if (coef_bits[coefi] != 0)
-	smoothing_useful = TRUE;
+  smoothing_useful = TRUE;
     }
     coef_bits_latch += SAVED_COEFS;
   }
@@ -460,7 +466,8 @@ smoothing_ok (j_decompress_ptr cinfo)
 METHODDEF(int)
 decompress_smooth_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
 {
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  d_coef_ptr coef = (d_coef_ptr) lossyd->coef_private;
   JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
   JDIMENSION block_num, last_block_column;
   int ci, block_row, block_rows, access_rows;
@@ -480,7 +487,7 @@ decompress_smooth_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
 
   /* Force some input to be done if we are getting ahead of the input. */
   while (cinfo->input_scan_number <= cinfo->output_scan_number &&
-	 ! cinfo->inputctl->eoi_reached) {
+   ! cinfo->inputctl->eoi_reached) {
     if (cinfo->input_scan_number == cinfo->output_scan_number) {
       /* If input is working on current scan, we ordinarily want it to
        * have completed the current row.  But if input scan is DC,
@@ -489,7 +496,7 @@ decompress_smooth_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
        */
       JDIMENSION delta = (cinfo->Ss == 0) ? 1 : 0;
       if (cinfo->input_iMCU_row > cinfo->output_iMCU_row+delta)
-	break;
+  break;
     }
     if ((*cinfo->inputctl->consume_input)(cinfo) == JPEG_SUSPENDED)
       return JPEG_SUSPENDED;
@@ -508,7 +515,7 @@ decompress_smooth_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
       last_row = FALSE;
     } else {
       /* NB: can't use last_row_height here; it is input-side-dependent! */
-      block_rows = (int) (compptr->height_in_blocks % compptr->v_samp_factor);
+      block_rows = (int) (compptr->height_in_data_units % compptr->v_samp_factor);
       if (block_rows == 0) block_rows = compptr->v_samp_factor;
       access_rows = block_rows; /* this iMCU row only */
       last_row = TRUE;
@@ -517,15 +524,15 @@ decompress_smooth_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
     if (cinfo->output_iMCU_row > 0) {
       access_rows += compptr->v_samp_factor; /* prior iMCU row too */
       buffer = (*cinfo->mem->access_virt_barray)
-	((j_common_ptr) cinfo, coef->whole_image[ci],
-	 (cinfo->output_iMCU_row - 1) * compptr->v_samp_factor,
-	 (JDIMENSION) access_rows, FALSE);
-      buffer += compptr->v_samp_factor;	/* point to current iMCU row */
+  ((j_common_ptr) cinfo, coef->whole_image[ci],
+   (cinfo->output_iMCU_row - 1) * compptr->v_samp_factor,
+   (JDIMENSION) access_rows, FALSE);
+      buffer += compptr->v_samp_factor;  /* point to current iMCU row */
       first_row = FALSE;
     } else {
       buffer = (*cinfo->mem->access_virt_barray)
-	((j_common_ptr) cinfo, coef->whole_image[ci],
-	 (JDIMENSION) 0, (JDIMENSION) access_rows, FALSE);
+  ((j_common_ptr) cinfo, coef->whole_image[ci],
+   (JDIMENSION) 0, (JDIMENSION) access_rows, FALSE);
       first_row = TRUE;
     }
     /* Fetch component-dependent info */
@@ -537,19 +544,19 @@ decompress_smooth_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
     Q20 = quanttbl->quantval[Q20_POS];
     Q11 = quanttbl->quantval[Q11_POS];
     Q02 = quanttbl->quantval[Q02_POS];
-    inverse_DCT = cinfo->idct->inverse_DCT[ci];
+    inverse_DCT = lossyd->inverse_DCT[ci];
     output_ptr = output_buf[ci];
     /* Loop over all DCT blocks to be processed. */
     for (block_row = 0; block_row < block_rows; block_row++) {
       buffer_ptr = buffer[block_row];
       if (first_row && block_row == 0)
-	prev_block_row = buffer_ptr;
+  prev_block_row = buffer_ptr;
       else
-	prev_block_row = buffer[block_row-1];
+  prev_block_row = buffer[block_row-1];
       if (last_row && block_row == block_rows-1)
-	next_block_row = buffer_ptr;
+  next_block_row = buffer_ptr;
       else
-	next_block_row = buffer[block_row+1];
+  next_block_row = buffer[block_row+1];
       /* We fetch the surrounding DC values using a sliding-register approach.
        * Initialize all nine here so as to do the right thing on narrow pics.
        */
@@ -557,106 +564,106 @@ decompress_smooth_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
       DC4 = DC5 = DC6 = (int) buffer_ptr[0][0];
       DC7 = DC8 = DC9 = (int) next_block_row[0][0];
       output_col = 0;
-      last_block_column = compptr->width_in_blocks - 1;
+      last_block_column = compptr->width_in_data_units - 1;
       for (block_num = 0; block_num <= last_block_column; block_num++) {
-	/* Fetch current DCT block into workspace so we can modify it. */
-	jcopy_block_row(buffer_ptr, (JBLOCKROW) workspace, (JDIMENSION) 1);
-	/* Update DC values */
-	if (block_num < last_block_column) {
-	  DC3 = (int) prev_block_row[1][0];
-	  DC6 = (int) buffer_ptr[1][0];
-	  DC9 = (int) next_block_row[1][0];
-	}
-	/* Compute coefficient estimates per K.8.
-	 * An estimate is applied only if coefficient is still zero,
-	 * and is not known to be fully accurate.
-	 */
-	/* AC01 */
-	if ((Al=coef_bits[1]) != 0 && workspace[1] == 0) {
-	  num = 36 * Q00 * (DC4 - DC6);
-	  if (num >= 0) {
-	    pred = (int) (((Q01<<7) + num) / (Q01<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	  } else {
-	    pred = (int) (((Q01<<7) - num) / (Q01<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	    pred = -pred;
-	  }
-	  workspace[1] = (JCOEF) pred;
-	}
-	/* AC10 */
-	if ((Al=coef_bits[2]) != 0 && workspace[8] == 0) {
-	  num = 36 * Q00 * (DC2 - DC8);
-	  if (num >= 0) {
-	    pred = (int) (((Q10<<7) + num) / (Q10<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	  } else {
-	    pred = (int) (((Q10<<7) - num) / (Q10<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	    pred = -pred;
-	  }
-	  workspace[8] = (JCOEF) pred;
-	}
-	/* AC20 */
-	if ((Al=coef_bits[3]) != 0 && workspace[16] == 0) {
-	  num = 9 * Q00 * (DC2 + DC8 - 2*DC5);
-	  if (num >= 0) {
-	    pred = (int) (((Q20<<7) + num) / (Q20<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	  } else {
-	    pred = (int) (((Q20<<7) - num) / (Q20<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	    pred = -pred;
-	  }
-	  workspace[16] = (JCOEF) pred;
-	}
-	/* AC11 */
-	if ((Al=coef_bits[4]) != 0 && workspace[9] == 0) {
-	  num = 5 * Q00 * (DC1 - DC3 - DC7 + DC9);
-	  if (num >= 0) {
-	    pred = (int) (((Q11<<7) + num) / (Q11<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	  } else {
-	    pred = (int) (((Q11<<7) - num) / (Q11<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	    pred = -pred;
-	  }
-	  workspace[9] = (JCOEF) pred;
-	}
-	/* AC02 */
-	if ((Al=coef_bits[5]) != 0 && workspace[2] == 0) {
-	  num = 9 * Q00 * (DC4 + DC6 - 2*DC5);
-	  if (num >= 0) {
-	    pred = (int) (((Q02<<7) + num) / (Q02<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	  } else {
-	    pred = (int) (((Q02<<7) - num) / (Q02<<8));
-	    if (Al > 0 && pred >= (1<<Al))
-	      pred = (1<<Al)-1;
-	    pred = -pred;
-	  }
-	  workspace[2] = (JCOEF) pred;
-	}
-	/* OK, do the IDCT */
-	(*inverse_DCT) (cinfo, compptr, (JCOEFPTR) workspace,
-			output_ptr, output_col);
-	/* Advance for next column */
-	DC1 = DC2; DC2 = DC3;
-	DC4 = DC5; DC5 = DC6;
-	DC7 = DC8; DC8 = DC9;
-	buffer_ptr++, prev_block_row++, next_block_row++;
-	output_col += compptr->DCT_scaled_size;
+  /* Fetch current DCT block into workspace so we can modify it. */
+  jcopy_block_row(buffer_ptr, (JBLOCKROW) workspace, (JDIMENSION) 1);
+  /* Update DC values */
+  if (block_num < last_block_column) {
+    DC3 = (int) prev_block_row[1][0];
+    DC6 = (int) buffer_ptr[1][0];
+    DC9 = (int) next_block_row[1][0];
+  }
+  /* Compute coefficient estimates per K.8.
+   * An estimate is applied only if coefficient is still zero,
+   * and is not known to be fully accurate.
+   */
+  /* AC01 */
+  if ((Al=coef_bits[1]) != 0 && workspace[1] == 0) {
+    num = 36 * Q00 * (DC4 - DC6);
+    if (num >= 0) {
+      pred = (int) (((Q01<<7) + num) / (Q01<<8));
+      if (Al > 0 && pred >= (1<<Al))
+        pred = (1<<Al)-1;
+    } else {
+      pred = (int) (((Q01<<7) - num) / (Q01<<8));
+      if (Al > 0 && pred >= (1<<Al))
+        pred = (1<<Al)-1;
+      pred = -pred;
+    }
+    workspace[1] = (JCOEF) pred;
+  }
+  /* AC10 */
+  if ((Al=coef_bits[2]) != 0 && workspace[8] == 0) {
+    num = 36 * Q00 * (DC2 - DC8);
+    if (num >= 0) {
+      pred = (int) (((Q10<<7) + num) / (Q10<<8));
+      if (Al > 0 && pred >= (1<<Al))
+        pred = (1<<Al)-1;
+    } else {
+      pred = (int) (((Q10<<7) - num) / (Q10<<8));
+      if (Al > 0 && pred >= (1<<Al))
+        pred = (1<<Al)-1;
+      pred = -pred;
+    }
+    workspace[8] = (JCOEF) pred;
+  }
+  /* AC20 */
+  if ((Al=coef_bits[3]) != 0 && workspace[16] == 0) {
+    num = 9 * Q00 * (DC2 + DC8 - 2*DC5);
+    if (num >= 0) {
+      pred = (int) (((Q20<<7) + num) / (Q20<<8));
+      if (Al > 0 && pred >= (1<<Al))
+        pred = (1<<Al)-1;
+    } else {
+      pred = (int) (((Q20<<7) - num) / (Q20<<8));
+      if (Al > 0 && pred >= (1<<Al))
+        pred = (1<<Al)-1;
+      pred = -pred;
+    }
+    workspace[16] = (JCOEF) pred;
+  }
+  /* AC11 */
+  if ((Al=coef_bits[4]) != 0 && workspace[9] == 0) {
+    num = 5 * Q00 * (DC1 - DC3 - DC7 + DC9);
+    if (num >= 0) {
+      pred = (int) (((Q11<<7) + num) / (Q11<<8));
+      if (Al > 0 && pred >= (1<<Al))
+        pred = (1<<Al)-1;
+    } else {
+      pred = (int) (((Q11<<7) - num) / (Q11<<8));
+      if (Al > 0 && pred >= (1<<Al))
+        pred = (1<<Al)-1;
+      pred = -pred;
+    }
+    workspace[9] = (JCOEF) pred;
+  }
+  /* AC02 */
+  if ((Al=coef_bits[5]) != 0 && workspace[2] == 0) {
+    num = 9 * Q00 * (DC4 + DC6 - 2*DC5);
+    if (num >= 0) {
+      pred = (int) (((Q02<<7) + num) / (Q02<<8));
+      if (Al > 0 && pred >= (1<<Al))
+        pred = (1<<Al)-1;
+    } else {
+      pred = (int) (((Q02<<7) - num) / (Q02<<8));
+      if (Al > 0 && pred >= (1<<Al))
+        pred = (1<<Al)-1;
+      pred = -pred;
+    }
+    workspace[2] = (JCOEF) pred;
+  }
+  /* OK, do the IDCT */
+  (*inverse_DCT) (cinfo, compptr, (JCOEFPTR) workspace,
+      output_ptr, output_col);
+  /* Advance for next column */
+  DC1 = DC2; DC2 = DC3;
+  DC4 = DC5; DC5 = DC6;
+  DC7 = DC8; DC8 = DC9;
+  buffer_ptr++, prev_block_row++, next_block_row++;
+  output_col += compptr->codec_data_unit;
       }
-      output_ptr += compptr->DCT_scaled_size;
+      output_ptr += compptr->codec_data_unit;
     }
   }
 
@@ -675,14 +682,15 @@ decompress_smooth_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
 GLOBAL(void)
 jinit_d_coef_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
 {
-  my_coef_ptr coef;
+  j_lossy_d_ptr lossyd = (j_lossy_d_ptr) cinfo->codec;
+  d_coef_ptr coef;
 
-  coef = (my_coef_ptr)
+  coef = (d_coef_ptr)
     (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_coef_controller));
-  cinfo->coef = (struct jpeg_d_coef_controller *) coef;
-  coef->pub.start_input_pass = start_input_pass;
-  coef->pub.start_output_pass = start_output_pass;
+        SIZEOF(d_coef_controller));
+  lossyd->coef_private = (void *) coef;
+  lossyd->coef_start_input_pass = start_input_pass;
+  lossyd->coef_start_output_pass = start_output_pass;
 #ifdef BLOCK_SMOOTHING_SUPPORTED
   coef->coef_bits_latch = NULL;
 #endif
@@ -697,24 +705,24 @@ jinit_d_coef_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
     jpeg_component_info *compptr;
 
     for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	 ci++, compptr++) {
+   ci++, compptr++) {
       access_rows = compptr->v_samp_factor;
 #ifdef BLOCK_SMOOTHING_SUPPORTED
       /* If block smoothing could be used, need a bigger window */
-      if (cinfo->progressive_mode)
-	access_rows *= 3;
+      if (cinfo->process == JPROC_PROGRESSIVE)
+  access_rows *= 3;
 #endif
       coef->whole_image[ci] = (*cinfo->mem->request_virt_barray)
-	((j_common_ptr) cinfo, JPOOL_IMAGE, TRUE,
-	 (JDIMENSION) jround_up((long) compptr->width_in_blocks,
-				(long) compptr->h_samp_factor),
-	 (JDIMENSION) jround_up((long) compptr->height_in_blocks,
-				(long) compptr->v_samp_factor),
-	 (JDIMENSION) access_rows);
+  ((j_common_ptr) cinfo, JPOOL_IMAGE, TRUE,
+   (JDIMENSION) jround_up((long) compptr->width_in_data_units,
+        (long) compptr->h_samp_factor),
+   (JDIMENSION) jround_up((long) compptr->height_in_data_units,
+        (long) compptr->v_samp_factor),
+   (JDIMENSION) access_rows);
     }
-    coef->pub.consume_data = consume_data;
-    coef->pub.decompress_data = decompress_data;
-    coef->pub.coef_arrays = coef->whole_image; /* link to virtual arrays */
+    lossyd->pub.consume_data = consume_data;
+    lossyd->pub.decompress_data = decompress_data;
+    lossyd->coef_arrays = coef->whole_image; /* link to virtual arrays */
 #else
     ERREXIT(cinfo, JERR_NOT_COMPILED);
 #endif
@@ -725,12 +733,12 @@ jinit_d_coef_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
 
     buffer = (JBLOCKROW)
       (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  D_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));
-    for (i = 0; i < D_MAX_BLOCKS_IN_MCU; i++) {
+          D_MAX_DATA_UNITS_IN_MCU * SIZEOF(JBLOCK));
+    for (i = 0; i < D_MAX_DATA_UNITS_IN_MCU; i++) {
       coef->MCU_buffer[i] = buffer + i;
     }
-    coef->pub.consume_data = dummy_consume_data;
-    coef->pub.decompress_data = decompress_onepass;
-    coef->pub.coef_arrays = NULL; /* flag for no virtual arrays */
+    lossyd->pub.consume_data = dummy_consume_data;
+    lossyd->pub.decompress_data = decompress_onepass;
+    lossyd->coef_arrays = NULL; /* flag for no virtual arrays */
   }
 }