summaryrefslogtreecommitdiff
path: root/jcmaster.c
diff options
context:
space:
mode:
authorThomas G. Lane <tgl@netcom.com>1992-12-10 00:00:00 +0000
committerDRC <information@libjpeg-turbo.org>2015-07-29 15:23:45 -0500
commit88aeed428fd820659e3ae00292cb84ecfc05dd23 (patch)
treec4db96b8043b8c97f0b39c55f67443d73856f2f9 /jcmaster.c
parent4a6b7303643714d495b9d26742d8a156fd120936 (diff)
The Independent JPEG Group's JPEG software v4
Diffstat (limited to 'jcmaster.c')
-rw-r--r--jcmaster.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/jcmaster.c b/jcmaster.c
index ec5c96d..b192aae 100644
--- a/jcmaster.c
+++ b/jcmaster.c
@@ -19,8 +19,8 @@ c_per_scan_method_selection (compress_info_ptr cinfo)
{
/* Edge expansion */
jselexpand(cinfo);
- /* Subsampling of pixels */
- jselsubsample(cinfo);
+ /* Downsampling of pixels */
+ jseldownsample(cinfo);
/* MCU extraction */
jselcmcu(cinfo);
}
@@ -36,7 +36,7 @@ c_initial_method_selection (compress_info_ptr cinfo)
/* Gamma and color space conversion */
jselccolor(cinfo);
/* Entropy encoding: either Huffman or arithmetic coding. */
-#ifdef ARITH_CODING_SUPPORTED
+#ifdef C_ARITH_CODING_SUPPORTED
jselcarithmetic(cinfo);
#else
cinfo->arith_code = FALSE; /* force Huffman mode */
@@ -71,7 +71,7 @@ initial_setup (compress_info_ptr cinfo)
}
- /* Compute logical subsampled dimensions of components */
+ /* Compute logical downsampled dimensions of components */
for (ci = 0; ci < cinfo->num_components; ci++) {
compptr = &cinfo->comp_info[ci];
compptr->true_comp_width = (cinfo->image_width * compptr->h_samp_factor