← Back to branch summary

~ubuntu-branches/ubuntu/saucy/sane-backends/saucy

« back to all changes in this revision

Viewing changes to backend/epson2-ops.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2011-02-14 14:28:56 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20110214142856-6gxjetg88q9zctid
Tags: 1.0.22-0ubuntu1
* New upstream release
* debian/control:
  - Use standards version 3.9.1
* debian/patches/allow_dll.d_symlinks.patch:
* debian/patches/fix_epson2_cancel.patch:
* debian/patches/fix_epson2_commands.patch:
* debian/patches/fix_xerox_mfp_color_mode.patch:
* debian/patches/genesys_disable_raw_data_log.patch:
* debian/patches/no_translations.patch:
* debian/patches/saned_exit_avahi_process.patch:
* debian/patches/scsi_perfection_2450.patch:
* debian/patches/scsi_scanjet_4c.patch:
* debian/patches/xerox_mfp_new_ids.patch:
  - Applied upstream
* debian/watch:
  - Dropped, the URL is not consistent between releases

Show diffs side-by-side

added added

removed removed

Lines of Context:
backend/epson2-ops.c
1342
1342
#endif
1343
1343
        }
1344
1344
 
 
1345
        if (s->params.bytes_per_line == 0)
 
1346
                return SANE_STATUS_INVAL;
 
1347
 
1345
1348
        /*
1346
1349
         * Calculate correction for line_distance in D1 scanner:
1347
1350
         * Start line_distance lines earlier and add line_distance lines at the end
1646
1649
                        esci_eject(s);
1647
1650
 
1648
1651
        /* XXX required? */
1649
 
        esci_reset(s);
 
1652
        if (s->hw->connection != SANE_EPSON_NET)
 
1653
                esci_reset(s);
1650
1654
}
1651
1655
 
1652
1656
void