Fixed some (but not all) MIN related compilation warnings (bug #300823).

merge-requests/1/head
Henning Geinitz 2004-06-22 16:16:45 +00:00
rodzic a491e60474
commit dd60b829d0
2 zmienionych plików z 12 dodań i 7 usunięć

Wyświetl plik

@ -1,3 +1,8 @@
2004-06-22 Henning Meier-Geinitz <henning@meier-geinitz.de>
* backend/microtek2.c: Fixed some (but not all) MIN related
compilation warnings (bug #300823).
2004-06-22 Rene Rebe <rene@rocklinux.org>
* backend/avision.c, backend/avision.h, doc/sane-avision.man:
Fixed compilation warning (Bug #300399) and added a force-a3

Wyświetl plik

@ -6396,7 +6396,7 @@ prepare_shading_data(Microtek2_Scanner *ms, u_int32_t lines, u_int8_t **data)
#endif
*((u_int16_t *) *data
+ color * ( mi->geo_width / mi->calib_divisor ) + i) =
MIN(0xffff, (u_int16_t) value);
(u_int16_t) MIN(0xffff, value);
}
}
break;
@ -6435,7 +6435,7 @@ prepare_shading_data(Microtek2_Scanner *ms, u_int32_t lines, u_int8_t **data)
#endif
*((u_int16_t *) *data
+ color * ( mi->geo_width / mi->calib_divisor ) + i) =
MIN(0xffff, (u_int16_t) value);
(u_int16_t) MIN(0xffff, value);
}
}
break;
@ -6457,7 +6457,7 @@ prepare_shading_data(Microtek2_Scanner *ms, u_int32_t lines, u_int8_t **data)
value /= lines;
*((u_int8_t *) *data
+ color * ( mi->geo_width / mi->calib_divisor ) + i) =
MIN(0xff, (u_int8_t) value);
(u_int8_t) MIN(0xff, value);
}
else
@ -6471,7 +6471,7 @@ prepare_shading_data(Microtek2_Scanner *ms, u_int32_t lines, u_int8_t **data)
value /= lines;
*((u_int16_t *) *data
+ color * ( mi->geo_width / mi->calib_divisor ) + i) =
MIN(0xffff, (u_int16_t) value);
(u_int16_t) MIN(0xffff, value);
}
}
@ -6969,7 +6969,7 @@ shading_function(Microtek2_Scanner *ms, u_int8_t *data)
value = (ms->lut_size * ms->lut_size) / value;
*((u_int16_t *) data
+ color * ( mi->geo_width / mi->calib_divisor ) + i) =
MIN(0xffff, (u_int16_t) value);
(u_int16_t) MIN(0xffff, value);
break;
case 0x11:
@ -6979,7 +6979,7 @@ shading_function(Microtek2_Scanner *ms, u_int8_t *data)
/ 255.0));
*((u_int16_t *) data
+ color * ( mi->geo_width / mi->calib_divisor ) + i) =
MIN(0xffff, (u_int16_t) value);
(u_int16_t) MIN(0xffff, value);
break;
case 0x15:
value = (u_int32_t) ( ( 1073741824 / (double) value )
@ -6988,7 +6988,7 @@ shading_function(Microtek2_Scanner *ms, u_int8_t *data)
value = MIN(value, (u_int32_t)65535);
*((u_int16_t *) data
+ color * ( mi->geo_width / mi->calib_divisor ) + i) =
MIN(0xffff, (u_int16_t) value);
(u_int16_t) MIN(0xffff, value);
break;
default: