diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:24:46 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:24:46 +0100 |
| commit | ecaaf250cb33ff61f37a7b441f2337584a655350 (patch) | |
| tree | 4303648095deff998ae20c2393b56db527742ac9 /backend/cardscan.c | |
| parent | 5793a221e112fa49073de0137d6bfa750a61b0a1 (diff) | |
| parent | 351b7328520c16730ceb46e5acae16038c42185e (diff) | |
Update upstream source from tag 'upstream/1.0.32'
Update to upstream version '1.0.32'
with Debian dir 2c1111c59d9d68bcbf479a4a4de7697fe2de127f
Diffstat (limited to 'backend/cardscan.c')
| -rw-r--r-- | backend/cardscan.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/backend/cardscan.c b/backend/cardscan.c index ec776d1..8090006 100644 --- a/backend/cardscan.c +++ b/backend/cardscan.c @@ -18,9 +18,7 @@ General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + along with this program. If not, see <https://www.gnu.org/licenses/>. As a special exception, the authors of SANE give permission for additional uses of the libraries contained in this release of SANE. @@ -167,7 +165,7 @@ many times { 14/94 and 22/a2 -########### discarge capacitor? ########### +########### discharge capacitor? ########### four times { >> 21 02 00 0a 00 << a1 00 02 00 0a 00 @@ -879,7 +877,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option, DBG (20, "sane_control_option: set value for '%s' (%d)\n", s->opt[option].name,option); if ( s->started ) { - DBG (5, "sane_control_option: cant set, device busy\n"); + DBG (5, "sane_control_option: can't set, device busy\n"); return SANE_STATUS_DEVICE_BUSY; } @@ -1366,7 +1364,7 @@ read_from_scanner_color(struct scanner *s) * handle h is a valid handle) but usually affects long-running * operations only (such as image is acquisition). It is safe to call * this function asynchronously (e.g., from within a signal handler). - * It is important to note that completion of this operaton does not + * It is important to note that completion of this operation does not * imply that the currently pending operation has been cancelled. It * only guarantees that cancellation has been initiated. Cancellation * completes only when the cancelled call returns (typically with a |