19 lines
801 B
Diff
19 lines
801 B
Diff
--- sane-backends-1.0.18/backend/canon.c.logical_vs_binary 2006-06-19 23:07:52.000000000 +0200
|
|
+++ sane-backends-1.0.18/backend/canon.c 2007-04-24 09:08:56.000000000 +0200
|
|
@@ -246,12 +246,12 @@
|
|
TPU_STAT_INACTIVE : TPU_STAT_NONE;
|
|
if (dev->tpu.Status == SANE_TRUE) /* TPU available */
|
|
{
|
|
- dev->tpu.Status = (tbuf[2 + 4 + 5] && 0x04) ?
|
|
+ dev->tpu.Status = (tbuf[2 + 4 + 5] & 0x04) ?
|
|
TPU_STAT_INACTIVE : TPU_STAT_ACTIVE;
|
|
}
|
|
- dev->tpu.ControlMode = tbuf[3 + 4 + 5] && 0x03;
|
|
+ dev->tpu.ControlMode = tbuf[3 + 4 + 5] & 0x03;
|
|
dev->tpu.Transparency = tbuf[4 + 4 + 5] * 256 + tbuf[5 + 4 + 5];
|
|
- dev->tpu.PosNeg = tbuf[6 + 4 + 5] && 0x01;
|
|
+ dev->tpu.PosNeg = tbuf[6 + 4 + 5] & 0x01;
|
|
dev->tpu.FilmType = tbuf[7 + 4 + 5];
|
|
|
|
DBG (11, "TPU Status: %d\n", dev->tpu.Status);
|