summaryrefslogtreecommitdiff
path: root/backend/canon.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
commit64ddd1a4dfcefd11f662f5cf4bb05b590d901a97 (patch)
tree4303648095deff998ae20c2393b56db527742ac9 /backend/canon.c
parent5793a221e112fa49073de0137d6bfa750a61b0a1 (diff)
parentecaaf250cb33ff61f37a7b441f2337584a655350 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/canon.c')
-rw-r--r--backend/canon.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/backend/canon.c b/backend/canon.c
index 4a5a2a2..e2ef932 100644
--- a/backend/canon.c
+++ b/backend/canon.c
@@ -21,9 +21,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.
@@ -55,10 +53,10 @@
. - sane_open() : open a particular scanner-device and attach_scanner(devicename,&dev)
. . - sane_set_io_mode : set blocking-mode
. . - sane_get_select_fd : get scanner-fd
- . . - sane_get_option_descriptor() : get option informations
+ . . - sane_get_option_descriptor() : get option information
. . - sane_control_option() : change option values
. .
- . . - sane_start() : start image aquisition
+ . . - sane_start() : start image acquisition
. . - sane_get_parameters() : returns actual scan-parameters
. . - sane_read() : read image-data (from pipe)
. . - sane_cancel() : cancel operation, kill reader_process
@@ -82,9 +80,9 @@
. - init_options
- sane_set_io_mode : set blocking-mode
- sane_get_select_fd : get scanner-fd
- - sane_get_option_descriptor() : get option informations
+ - sane_get_option_descriptor() : get option information
- sane_control_option() : change option values
- - sane_start() : start image aquisition
+ - sane_start() : start image acquisition
- sane_get_parameters() : returns actual scan-parameters
- sane_read() : read image-data (from pipe)
- sane_cancel() : cancel operation, kill reader_process