diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-02-01 17:52:33 +0100 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-02-01 17:53:12 +0100 |
| commit | 8844e567fdc7f68c378f727a63278d94c2dd51bf (patch) | |
| tree | 0a25cb72af3575fd09e4d6e83630034b0b707943 /test/monniaux/jpeg-6b/jdmainct.c | |
| parent | 35244064bbb2a853fb5c08898e8a74a7ec489aaa (diff) | |
| download | compcert-kvx-8844e567fdc7f68c378f727a63278d94c2dd51bf.tar.gz compcert-kvx-8844e567fdc7f68c378f727a63278d94c2dd51bf.zip | |
it still seems to work
Diffstat (limited to 'test/monniaux/jpeg-6b/jdmainct.c')
| -rw-r--r-- | test/monniaux/jpeg-6b/jdmainct.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/test/monniaux/jpeg-6b/jdmainct.c b/test/monniaux/jpeg-6b/jdmainct.c index c4be8ac1..e78bd8a4 100644 --- a/test/monniaux/jpeg-6b/jdmainct.c +++ b/test/monniaux/jpeg-6b/jdmainct.c @@ -175,8 +175,9 @@ alloc_funny_pointers (j_decompress_ptr cinfo) for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components; ci++, compptr++) { - rgroup = (compptr->v_samp_factor * compptr->DCT_scaled_size) / - cinfo->min_DCT_scaled_size; /* height of a row group of component */ + rgroup = INT_DIV((compptr->v_samp_factor * compptr->DCT_scaled_size), + cinfo->min_DCT_scaled_size); + /* height of a row group of component */ /* Get space for pointer lists --- M+4 row groups in each list. * We alloc both pointer lists with one call to save a few cycles. */ @@ -208,8 +209,9 @@ make_funny_pointers (j_decompress_ptr cinfo) for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components; ci++, compptr++) { - rgroup = (compptr->v_samp_factor * compptr->DCT_scaled_size) / - cinfo->min_DCT_scaled_size; /* height of a row group of component */ + rgroup = INT_DIV((compptr->v_samp_factor * compptr->DCT_scaled_size), + cinfo->min_DCT_scaled_size); + /* height of a row group of component */ xbuf0 = main->xbuffer[0][ci]; xbuf1 = main->xbuffer[1][ci]; /* First copy the workspace pointers as-is */ @@ -248,8 +250,9 @@ set_wraparound_pointers (j_decompress_ptr cinfo) for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components; ci++, compptr++) { - rgroup = (compptr->v_samp_factor * compptr->DCT_scaled_size) / - cinfo->min_DCT_scaled_size; /* height of a row group of component */ + rgroup = INT_DIV((compptr->v_samp_factor * compptr->DCT_scaled_size), + cinfo->min_DCT_scaled_size); + /* height of a row group of component */ xbuf0 = main->xbuffer[0][ci]; xbuf1 = main->xbuffer[1][ci]; for (i = 0; i < rgroup; i++) { @@ -278,7 +281,7 @@ set_bottom_pointers (j_decompress_ptr cinfo) ci++, compptr++) { /* Count sample rows in one iMCU row and in one row group */ iMCUheight = compptr->v_samp_factor * compptr->DCT_scaled_size; - rgroup = iMCUheight / cinfo->min_DCT_scaled_size; + rgroup = INT_DIV(iMCUheight, cinfo->min_DCT_scaled_size); /* Count nondummy sample rows remaining for this component */ rows_left = (int) (compptr->downsampled_height % (JDIMENSION) iMCUheight); if (rows_left == 0) rows_left = iMCUheight; @@ -286,7 +289,7 @@ set_bottom_pointers (j_decompress_ptr cinfo) * so we need only do it once. */ if (ci == 0) { - main->rowgroups_avail = (JDIMENSION) ((rows_left-1) / rgroup + 1); + main->rowgroups_avail = (JDIMENSION) (INT_DIV((rows_left-1), rgroup) + 1); } /* Duplicate the last real sample row rgroup*2 times; this pads out the * last partial rowgroup and ensures at least one full rowgroup of context. @@ -503,8 +506,9 @@ jinit_d_main_controller (j_decompress_ptr cinfo, boolean need_full_buffer) for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components; ci++, compptr++) { - rgroup = (compptr->v_samp_factor * compptr->DCT_scaled_size) / - cinfo->min_DCT_scaled_size; /* height of a row group of component */ + rgroup = INT_DIV((compptr->v_samp_factor * compptr->DCT_scaled_size), + cinfo->min_DCT_scaled_size); + /* height of a row group of component */ main->buffer[ci] = (*cinfo->mem->alloc_sarray) ((j_common_ptr) cinfo, JPOOL_IMAGE, compptr->width_in_blocks * compptr->DCT_scaled_size, |