mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Ulrich Deiters: fixed unintialized variable in backend/canon-sane.c

merge-requests/1/head
Ulrich Deiters 2005-11-25 22:32:52 +00:00
rodzic be98ef52ac
commit cd3365e8d6
3 zmienionych plików z 9 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
ChangeLog
Wyświetl plik

@ -1,3 +1,7 @@
2005-11-25 Ulrich Deiters <ulrich.deiters@uni-koeln.de>
* backend/canon-sane: fixed usage of an uninitialized variable
2005-11-25 Henning Meier-Geinitz <henning@meier-geinitz.de>
* po/sane-backends.da.po: Updated Danish translation (from Mogens

8
backend/canon-sane.c
Wyświetl plik

@ -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)
{

2
backend/snapscan.conf
Wyświetl plik

@ -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.