diff --git a/ChangeLog b/ChangeLog index 327dcc14b..76561dff6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-11-25 Ulrich Deiters + + * backend/canon-sane: fixed usage of an uninitialized variable + 2005-11-25 Henning Meier-Geinitz * po/sane-backends.da.po: Updated Danish translation (from Mogens diff --git a/backend/canon-sane.c b/backend/canon-sane.c index 6e26a7188..54052754b 100644 --- a/backend/canon-sane.c +++ b/backend/canon-sane.c @@ -1919,9 +1919,10 @@ SANE_Int *len) { CANON_Scanner *s = handle; SANE_Status status; - SANE_Byte *firstimage, *secondimage/*, inmask, outmask, outbyte, primaryHigh[256], primaryLow[256], secondaryHigh[256], secondaryLow[256] */; + SANE_Byte *firstimage, *secondimage/*, inmask, outmask, outbyte, + primaryHigh[256], primaryLow[256], secondaryHigh[256], + secondaryLow[256] */; SANE_Int ncopy; - u_char dbuf[28]; size_t buf_size, nread, remain, nwritten, nremain, pos, pix, pixel_per_line, byte, byte_per_line/*, bit*/; @@ -1950,8 +1951,7 @@ SANE_Int *len) *len = 0; - DBG (21, " read_fb1200: nread=%d, bytes_to_read=%d\n", nread, - s->bytes_to_read); + DBG (21, " read_fb1200: bytes_to_read=%d\n", s->bytes_to_read); if (s->bytes_to_read == 0 && s->buf_pos == s->buf_used) { diff --git a/backend/snapscan.conf b/backend/snapscan.conf index 63cbfae5f..4317683a7 100644 --- a/backend/snapscan.conf +++ b/backend/snapscan.conf @@ -2,7 +2,7 @@ # Change to the fully qualified filename of your firmware file, if # firmware upload is needed by the scanner -firmware /path/to/your/firmware/file.bin +firmware /usr/share/sane/Esfw52.bin # If not automatically found you may manually specify a device name.