diff options
| author | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2010-10-08 08:05:44 +0000 |
|---|---|---|
| committer | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2010-10-08 08:05:44 +0000 |
| commit | 6e9ee9153083823b4a0e429aaa7fe7e9310af161 (patch) | |
| tree | f28ee025ea7a9b7a700dd51e6ef1e64a67ef6e16 /trunk/jdsample.c | |
| parent | 898b3e10b54e9fa6b3c6dc91bbc362057c0c6dcc (diff) | |
Added optional emulation of the jpeg-7 or jpeg-8b API/ABI's
git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@236 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'trunk/jdsample.c')
| -rw-r--r-- | trunk/jdsample.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/trunk/jdsample.c b/trunk/jdsample.c index 4e0b8b4..5f6ffbe 100644 --- a/trunk/jdsample.c +++ b/trunk/jdsample.c @@ -3,6 +3,7 @@ * * Copyright (C) 1991-1996, Thomas G. Lane. * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB + * 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. * @@ -23,6 +24,7 @@ #include "jinclude.h" #include "jpeglib.h" #include "jsimd.h" +#include "jpegcomp.h" /* Pointer to routine to upsample a single component */ @@ -420,7 +422,7 @@ jinit_upsampler (j_decompress_ptr cinfo) /* jdmainct.c doesn't support context rows when min_DCT_scaled_size = 1, * so don't ask for it. */ - do_fancy = cinfo->do_fancy_upsampling && cinfo->min_DCT_scaled_size > 1; + do_fancy = cinfo->do_fancy_upsampling && _min_DCT_scaled_size > 1; /* Verify we can handle the sampling factors, select per-component methods, * and create storage as needed. @@ -430,10 +432,10 @@ jinit_upsampler (j_decompress_ptr cinfo) /* Compute size of an "input group" after IDCT scaling. This many samples * are to be converted to max_h_samp_factor * max_v_samp_factor pixels. */ - h_in_group = (compptr->h_samp_factor * compptr->DCT_scaled_size) / - cinfo->min_DCT_scaled_size; - v_in_group = (compptr->v_samp_factor * compptr->DCT_scaled_size) / - cinfo->min_DCT_scaled_size; + h_in_group = (compptr->h_samp_factor * _DCT_scaled_size) / + _min_DCT_scaled_size; + v_in_group = (compptr->v_samp_factor * _DCT_scaled_size) / + _min_DCT_scaled_size; h_out_group = cinfo->max_h_samp_factor; v_out_group = cinfo->max_v_samp_factor; upsample->rowgroup_height[ci] = v_in_group; /* save for use later */ |