← Back to branch summary

~ubuntu-branches/ubuntu/vivid/sane-backends/vivid

« back to all changes in this revision

Viewing changes to backend/epson2_net.c

  • Committer: Bazaar Package Importer
  • Author(s): Julien BLACHE
  • Date: 2011-02-16 19:00:55 UTC
  • mfrom: (1.2.2 upstream) (21.1.2 experimental)
  • Revision ID: james.westby@ubuntu.com-20110216190055-wz0c33eracchkxts
Tags: 1.0.22-1
http://bugs.debian.org/581181
http://bugs.debian.org/591767
http://bugs.debian.org/612815
* New upstream release.
  + epson2: reject scan area settings that would lead to a division by zero
    (closes: #581181).

* debian/control:
  + Bump Standards-Version to 3.9.1 (no changes).
  + Demote libsane-extras-* to Recommends again.
* debian/rules:
  + Add acl (>= 2.2.49-4) to udev substvar for ACL utilities in /bin.
  + Use sane-desc -m udev+acl (closes: #591767, #612815).
* debian/libsane.README.Debian:
  + Update; mention ConsoleKit and the udev rules now using ACLs.

* debian/patches/sane-desc_udev+acl.patch:
  + Added; compared to experimental, setfacl is now in /bin.
* debian/patches/fix_xerox_mfp_color_mode.patch,
  debian/patches/use_libsane_matched_for_scsi.patch,
  debian/patches/allow_dll.d_symlinks.patch,
  debian/patches/saned_exit_avahi_process.patch,
  debian/patches/xerox_mfp_new_ids.patch,
  debian/patches/scsi_perfection_2450.patch,
  debian/patches/scsi_scanjet_4c.patch,
  debian/patches/genesys_disable_raw_data_log.patch,
  debian/patches/fix_epson2_commands.patch,
  debian/patches/fix_epson2_cancel.patch:
  + Removed; merged upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
backend/epson2_net.c
52
52
}
53
53
 
54
54
int
55
 
sanei_epson_net_read(Epson_Scanner *s, unsigned char *buf, size_t wanted,
 
55
sanei_epson_net_read(Epson_Scanner *s, unsigned char *buf, ssize_t wanted,
56
56
                       SANE_Status * status)
57
57
{
58
 
        size_t size;
 
58
        ssize_t size;
59
59
        ssize_t read = 0;
60
60
        unsigned char header[12];
61
61