aboutsummaryrefslogtreecommitdiffstats
path: root/test/monniaux/jpeg-6b/jcsample.c
diff options
context:
space:
mode:
authorDavid Monniaux <david.monniaux@univ-grenoble-alpes.fr>2019-02-01 17:52:33 +0100
committerDavid Monniaux <david.monniaux@univ-grenoble-alpes.fr>2019-02-01 17:53:12 +0100
commit8844e567fdc7f68c378f727a63278d94c2dd51bf (patch)
tree0a25cb72af3575fd09e4d6e83630034b0b707943 /test/monniaux/jpeg-6b/jcsample.c
parent35244064bbb2a853fb5c08898e8a74a7ec489aaa (diff)
downloadcompcert-kvx-8844e567fdc7f68c378f727a63278d94c2dd51bf.tar.gz
compcert-kvx-8844e567fdc7f68c378f727a63278d94c2dd51bf.zip
it still seems to work
Diffstat (limited to 'test/monniaux/jpeg-6b/jcsample.c')
-rw-r--r--test/monniaux/jpeg-6b/jcsample.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/monniaux/jpeg-6b/jcsample.c b/test/monniaux/jpeg-6b/jcsample.c
index 212ec875..d2693198 100644
--- a/test/monniaux/jpeg-6b/jcsample.c
+++ b/test/monniaux/jpeg-6b/jcsample.c
@@ -146,8 +146,8 @@ int_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
JSAMPROW inptr, outptr;
INT32 outvalue;
- h_expand = cinfo->max_h_samp_factor / compptr->h_samp_factor;
- v_expand = cinfo->max_v_samp_factor / compptr->v_samp_factor;
+ h_expand = INT_DIV(cinfo->max_h_samp_factor, compptr->h_samp_factor);
+ v_expand = INT_DIV(cinfo->max_v_samp_factor, compptr->v_samp_factor);
numpix = h_expand * v_expand;
numpix2 = numpix/2;
@@ -170,7 +170,7 @@ int_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
outvalue += (INT32) GETJSAMPLE(*inptr++);
}
}
- *outptr++ = (JSAMPLE) ((outvalue + numpix2) / numpix);
+ *outptr++ = (JSAMPLE) INT_DIV((outvalue + numpix2), numpix);
}
inrow += v_expand;
}
@@ -504,8 +504,8 @@ jinit_downsampler (j_compress_ptr cinfo)
} else
#endif
downsample->methods[ci] = h2v2_downsample;
- } else if ((cinfo->max_h_samp_factor % compptr->h_samp_factor) == 0 &&
- (cinfo->max_v_samp_factor % compptr->v_samp_factor) == 0) {
+ } else if (INT_UMOD(cinfo->max_h_samp_factor, compptr->h_samp_factor) == 0 &&
+ INT_UMOD(cinfo->max_v_samp_factor, compptr->v_samp_factor) == 0) {
smoothok = FALSE;
downsample->methods[ci] = int_downsample;
} else