diff options
author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-02-01 18:28:25 +0100 |
---|---|---|
committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-02-01 19:11:44 +0100 |
commit | 9d54081bf1f8dafe9ae71f3e3b0dd10ef7b931c2 (patch) | |
tree | 5091224db33b789c2a1fa0764a04305094415695 /test/monniaux/jpeg-6b/jdsample.c | |
parent | 8844e567fdc7f68c378f727a63278d94c2dd51bf (diff) | |
download | compcert-kvx-9d54081bf1f8dafe9ae71f3e3b0dd10ef7b931c2.tar.gz compcert-kvx-9d54081bf1f8dafe9ae71f3e3b0dd10ef7b931c2.zip |
fix various divisions, 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 80ffefb2..96d56f0c 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 = (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 = INT_DIV((compptr->h_samp_factor * compptr->DCT_scaled_size), + cinfo->min_DCT_scaled_size); + v_in_group = INT_DIV((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 ((h_out_group % h_in_group) == 0 && - (v_out_group % v_in_group) == 0) { + } else if (INT_MOD(h_out_group, h_in_group) == 0 && + INT_MOD(v_out_group, v_in_group) == 0) { /* Generic integral-factors upsampling method */ upsample->methods[ci] = int_upsample; - upsample->h_expand[ci] = (UINT8) (h_out_group / h_in_group); - upsample->v_expand[ci] = (UINT8) (v_out_group / v_in_group); + upsample->h_expand[ci] = (UINT8) INT_DIV(h_out_group, h_in_group); + upsample->v_expand[ci] = (UINT8) INT_DIV(v_out_group, v_in_group); } else ERREXIT(cinfo, JERR_FRACT_SAMPLE_NOTIMPL); if (need_buffer) { |