diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-10-08 12:33:06 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-10-08 12:33:06 +0200 |
commit | 24feb9f37f302c006ba51502da817325200e74d0 (patch) | |
tree | d4451782449e5fcbae9cbe3778c51a8c6cb3c36d /backend/pixma_common.h | |
parent | 76b69ebb381d40458339c9940135740797cbd2d4 (diff) | |
parent | cfd27ef2ad8b005fd47ab41ef29b71d9e3d48201 (diff) |
Merge tag 'upstream/1.0.25'
Upstream version 1.0.25
Diffstat (limited to 'backend/pixma_common.h')
-rw-r--r-- | backend/pixma_common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backend/pixma_common.h b/backend/pixma_common.h index 86d459f..dbaa23f 100644 --- a/backend/pixma_common.h +++ b/backend/pixma_common.h @@ -1,7 +1,7 @@ /* SANE - Scanner Access Now Easy. + Copyright (C) 2011-2015 Rolf Bensch <rolf at bensch hyphen online dot de> Copyright (C) 2006-2007 Wittawat Yamwong <wittawat@web.de> - Copyright (C) 2011-2013 Rolf Bensch <rolf at bensch hyphen online dot de> This file is part of the SANE package. @@ -147,7 +147,7 @@ struct pixma_scan_ops_t * -# Fill the buffer pointed by ib->wptr directly and leave * ib->rptr and ib->rend untouched. The length of the buffer is * ib->wend - ib->wptr. It must update ib->wptr accordingly. - * -# Update ib->rptr and ib->rend to point to the the beginning and + * -# Update ib->rptr and ib->rend to point to the beginning and * the end of the internal buffer resp. The length of the buffer * is ib->rend - ib->rptr. This function is called again if * and only if pixma_read_image() has copied the whole buffer. |