diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-05-18 07:43:35 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-05-18 07:43:35 +0200 |
commit | 9f8889f928ce86ba4a78659d378c6ba29bc9f735 (patch) | |
tree | c9567cb0d015b68ce3da8d03472b6443f1cb1ca9 /backend/canon.c | |
parent | 446e9454b8cbe5b689149415d11d36e88442ca88 (diff) | |
parent | 154785ab2d5df7ddc8c2cf813b773c340e5e2aea (diff) |
Merge branch 'release/debian/1.0.32-1'debian/1.0.32-1
Diffstat (limited to 'backend/canon.c')
-rw-r--r-- | backend/canon.c | 12 |
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 |