diff --git a/doc/sane.tex b/doc/sane.tex index e60bccd23..86284583c 100644 --- a/doc/sane.tex +++ b/doc/sane.tex @@ -14,7 +14,7 @@ \title{\huge SANE Standard Version 1.01} \author{} -\date{\today} +\date{July 31, 2000} \makeindex diff --git a/frontend/xscanimage.c b/frontend/xscanimage.c index 56f9fde34..933467beb 100644 --- a/frontend/xscanimage.c +++ b/frontend/xscanimage.c @@ -119,7 +119,7 @@ static struct option long_options[] = { {"help", no_argument, NULL, 'h'}, {"version", no_argument, NULL, 'V'}, - {0, } + {0, 0, 0, 0 } }; @@ -367,24 +367,24 @@ update_param (GSGDialog *dialog, void *arg) if (sane_get_parameters (gsg_dialog_get_device (dialog), ¶ms) == SANE_STATUS_GOOD) { - u_long size = 10 * params.bytes_per_line * params.lines; + double size = params.bytes_per_line * params.lines; const char *unit = "B"; if (params.format >= SANE_FRAME_RED && params.format <= SANE_FRAME_BLUE) size *= 3; - if (size >= 10 * 1024 * 1024) + if (size >= 1024 * 1024) { size /= 1024 * 1024; unit = "MB"; } - else if (size >= 10 * 1024) + else if (size >= 1024) { size /= 1024; unit = "KB"; } - sprintf (buf, "%dx%d: %lu.%01lu %s", params.pixels_per_line, - params.lines, size / 10, size % 10, unit); + sprintf (buf, "%dx%d: %1.1f %s", params.pixels_per_line, + params.lines, size, unit); } else sprintf (buf, "Invalid parameters."); @@ -555,7 +555,7 @@ input_available (gpointer data, gint source, GdkInputCondition cond) while (1) { - status = sane_read (dev, buf, sizeof (buf), &len); + status = sane_read (dev, (unsigned char *) buf, sizeof (buf), &len); if (status != SANE_STATUS_GOOD) { if (status == SANE_STATUS_EOF) diff --git a/sanei/sanei_ab306.c b/sanei/sanei_ab306.c index 21e7b78c0..ccbc39c5e 100644 --- a/sanei/sanei_ab306.c +++ b/sanei/sanei_ab306.c @@ -138,7 +138,7 @@ ab306_outb (Port *p, u_long addr, u_char val) if (p->port_fd >= 0) { - if (lseek (p->port_fd, addr, SEEK_SET) != addr) + if ((u_long) lseek (p->port_fd, addr, SEEK_SET) != addr) return; if (write (p->port_fd, &val, 1) != 1) return; @@ -154,7 +154,7 @@ ab306_inb (Port *p, u_long addr) if (p->port_fd >= 0) { - if (lseek (p->port_fd, addr, SEEK_SET) != addr) + if ((u_long) lseek (p->port_fd, addr, SEEK_SET) != addr) return -1; if (read (p->port_fd, &ch, 1) != 1) return -1; @@ -196,7 +196,8 @@ static SANE_Status ab306_write (Port *p, const void *buf, size_t len) { u_long base = p->base; - int i, cksum = 0; + u_int i; + int cksum = 0; DBG(3, "ab306_write: waiting for scanner to be ready %02x\n", ab306_inb (p, base + 1)); @@ -397,7 +398,7 @@ sanei_ab306_cmd (int fd, const void *src, size_t src_size, if (dst && *dst_size > 0) { - int i, cksum = 0; + u_int i, cksum = 0; DBG(3, "sanei_ab306_cmd: waiting for scanner to be NOT ready %02x\n", ab306_inb (p, p->base + 1)); @@ -447,13 +448,13 @@ sanei_ab306_rdata (int fd, int planes, SANE_Byte * buf, int lines, int bpl) do nstat = ab306_inb (p, p->base + 1); while (((p->lstat ^ nstat) & 0x10) == 0); - + if (p->port_fd >= 0) { /* the pixel-loop: */ for (bcnt = 0; bcnt < xmax; bcnt++) { - if (lseek (p->port_fd, p->base, SEEK_SET) != p->base) + if ((u_long) lseek (p->port_fd, p->base, SEEK_SET) != p->base) return SANE_STATUS_IO_ERROR; if (read (p->port_fd, buf, 1) != 1) return SANE_STATUS_IO_ERROR;