diff options
Diffstat (limited to 'test/monniaux/jpeg-6b/jcsample.c')
| -rw-r--r-- | test/monniaux/jpeg-6b/jcsample.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/monniaux/jpeg-6b/jcsample.c b/test/monniaux/jpeg-6b/jcsample.c index d2693198..212ec875 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 = INT_DIV(cinfo->max_h_samp_factor, compptr->h_samp_factor); - v_expand = INT_DIV(cinfo->max_v_samp_factor, compptr->v_samp_factor); + h_expand = cinfo->max_h_samp_factor / compptr->h_samp_factor; + v_expand = 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) INT_DIV((outvalue + numpix2), numpix); + *outptr++ = (JSAMPLE) ((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 (INT_UMOD(cinfo->max_h_samp_factor, compptr->h_samp_factor) == 0 && - INT_UMOD(cinfo->max_v_samp_factor, compptr->v_samp_factor) == 0) { + } else if ((cinfo->max_h_samp_factor % compptr->h_samp_factor) == 0 && + (cinfo->max_v_samp_factor % compptr->v_samp_factor) == 0) { smoothok = FALSE; downsample->methods[ci] = int_downsample; } else |