Updates libjpeg-turbo to 1.1.90 (r677)

third_party/libjpeg_turbo/jdcoefct.c

 /*
  * jdcoefct.c
  *
  * Copyright (C) 1994-1997, Thomas G. Lane.
+ * Copyright (C) 2010, D. R. Commander.
  * 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.
  * The coefficient buffer lies between entropy decoding and inverse-DCT steps.
  *
  * In buffered-image mode, this controller is the interface between
  * input-oriented processing and output-oriented processing.
  * Also, the input side (only) is used when reading a file for transcoding.
  */
 
 #define JPEG_INTERNALS
 #include "jinclude.h"
 #include "jpeglib.h"
+#include "jpegcomp.h"
 
 /* Block smoothing is only applicable for progressive JPEG, so: */
 #ifndef D_PROGRESSIVE_SUPPORTED
 #undef BLOCK_SMOOTHING_SUPPORTED
 #endif
 
 /* Private buffer controller object */
 
 typedef struct {
   struct jpeg_d_coef_controller pub; /* public fields */
@@ skipping 153 matching lines @@
         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;
+          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;
+              output_col += compptr->_DCT_scaled_size;
             }
           }
           blkn += compptr->MCU_width;
-          output_ptr += compptr->DCT_scaled_size;
+          output_ptr += compptr->_DCT_scaled_size;
         }
       }
     }
     /* Completed an MCU row, but perhaps not an iMCU row */
     coef->MCU_ctr = 0;
   }
   /* Completed the iMCU row, advance counters for next one */
   cinfo->output_iMCU_row++;
   if (++(cinfo->input_iMCU_row) < cinfo->total_iMCU_rows) {
     start_iMCU_row(cinfo);
@@ skipping 140 matching lines @@
     inverse_DCT = cinfo->idct->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;
+        output_col += compptr->_DCT_scaled_size;
       }
-      output_ptr += compptr->DCT_scaled_size;
+      output_ptr += compptr->_DCT_scaled_size;
     }
   }
 
   if (++(cinfo->output_iMCU_row) < cinfo->total_iMCU_rows)
     return JPEG_ROW_COMPLETED;
   return JPEG_SCAN_COMPLETED;
 }
 
 #endif /* D_MULTISCAN_FILES_SUPPORTED */
 
@@ skipping 272 matching lines @@
           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;
+        output_col += compptr->_DCT_scaled_size;
       }
-      output_ptr += compptr->DCT_scaled_size;
+      output_ptr += compptr->_DCT_scaled_size;
     }
   }
 
   if (++(cinfo->output_iMCU_row) < cinfo->total_iMCU_rows)
     return JPEG_ROW_COMPLETED;
   return JPEG_SCAN_COMPLETED;
 }
 
 #endif /* BLOCK_SMOOTHING_SUPPORTED */
 
@@ skipping 62 matching lines @@
     coef->pub.consume_data = dummy_consume_data;
     coef->pub.decompress_data = decompress_onepass;
     coef->pub.coef_arrays = NULL; /* flag for no virtual arrays */
   }
 
   /* Allocate the workspace buffer */
   coef->workspace = (JCOEF *)
     (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
                                 SIZEOF(JCOEF) * DCTSIZE2);
 }