diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-02-01 15:45:39 +0100 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-02-01 15:45:39 +0100 |
| commit | 35244064bbb2a853fb5c08898e8a74a7ec489aaa (patch) | |
| tree | e9b7ccb8b46174301ccf106807ea2fcd640350e5 /test/monniaux/jpeg-6b/jdsample.c | |
| parent | 8ae9063a94fbf3756bb2b1d596f35b81e3e608eb (diff) | |
| download | compcert-kvx-35244064bbb2a853fb5c08898e8a74a7ec489aaa.tar.gz compcert-kvx-35244064bbb2a853fb5c08898e8a74a7ec489aaa.zip | |
block tail calls etc.
Diffstat (limited to 'test/monniaux/jpeg-6b/jdsample.c')
| -rw-r--r-- | test/monniaux/jpeg-6b/jdsample.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/monniaux/jpeg-6b/jdsample.c b/test/monniaux/jpeg-6b/jdsample.c index 766ca28f..80ffefb2 100644 --- a/test/monniaux/jpeg-6b/jdsample.c +++ b/test/monniaux/jpeg-6b/jdsample.c @@ -428,10 +428,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 = DIVISION((compptr->h_samp_factor * compptr->DCT_scaled_size), - cinfo->min_DCT_scaled_size); - v_in_group = DIVISION((compptr->v_samp_factor * compptr->DCT_scaled_size), - cinfo->min_DCT_scaled_size); + 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_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 */ @@ -459,12 +459,12 @@ jinit_upsampler (j_decompress_ptr cinfo) upsample->pub.need_context_rows = TRUE; } else upsample->methods[ci] = h2v2_upsample; - } else if (MODULO(h_out_group, h_in_group) == 0 && - MODULO(v_out_group, v_in_group) == 0) { + } else if ((h_out_group % h_in_group) == 0 && + (v_out_group % v_in_group) == 0) { /* Generic integral-factors upsampling method */ upsample->methods[ci] = int_upsample; - upsample->h_expand[ci] = (UINT8) DIVISION(h_out_group, h_in_group); - upsample->v_expand[ci] = (UINT8) DIVISION(v_out_group, v_in_group); + upsample->h_expand[ci] = (UINT8) (h_out_group / h_in_group); + upsample->v_expand[ci] = (UINT8) (v_out_group / v_in_group); } else ERREXIT(cinfo, JERR_FRACT_SAMPLE_NOTIMPL); if (need_buffer) { |