aboutsummaryrefslogtreecommitdiffstats
path: root/test/monniaux/jpeg-6b/rdbmp.c
diff options
context:
space:
mode:
Diffstat (limited to 'test/monniaux/jpeg-6b/rdbmp.c')
-rw-r--r--test/monniaux/jpeg-6b/rdbmp.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/test/monniaux/jpeg-6b/rdbmp.c b/test/monniaux/jpeg-6b/rdbmp.c
index 29b1d484..b05fe2ac 100644
--- a/test/monniaux/jpeg-6b/rdbmp.c
+++ b/test/monniaux/jpeg-6b/rdbmp.c
@@ -229,8 +229,7 @@ preload_image (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
source->source_row = cinfo->image_height;
/* And read the first row */
- int ret= (*source->pub.get_pixel_rows) (cinfo, sinfo);
- return ret;
+ return (*source->pub.get_pixel_rows) (cinfo, sinfo);
}
@@ -337,8 +336,8 @@ start_input_bmp (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
if (biXPelsPerMeter > 0 && biYPelsPerMeter > 0) {
/* Set JFIF density parameters from the BMP data */
- cinfo->X_density = (UINT16) INT_DIV(biXPelsPerMeter, 100); /* 100 cm per meter */
- cinfo->Y_density = (UINT16) INT_DIV(biYPelsPerMeter, 100);
+ cinfo->X_density = (UINT16) (biXPelsPerMeter/100); /* 100 cm per meter */
+ cinfo->Y_density = (UINT16) (biYPelsPerMeter/100);
cinfo->density_unit = 2; /* dots/cm */
}
break;