Index: third_party/libjpeg_turbo/jdcoefct.c |
=================================================================== |
--- third_party/libjpeg_turbo/jdcoefct.c (revision 95020) |
+++ third_party/libjpeg_turbo/jdcoefct.c (working copy) |
@@ -2,6 +2,7 @@ |
* 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. |
* |
@@ -17,6 +18,7 @@ |
#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 |
@@ -190,7 +192,7 @@ |
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 || |
@@ -200,11 +202,11 @@ |
(*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; |
} |
} |
} |
@@ -365,9 +367,9 @@ |
(*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; |
} |
} |
@@ -660,9 +662,9 @@ |
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; |
} |
} |