summaryrefslogtreecommitdiff
path: root/backend/canon-sane.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:29:05 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:29:05 +0200
commit324a8a71bb7d9e4f8bc49b6bc47efaf9fb58282e (patch)
treebd2d48a139bfbe869f4f49359b63097931a45e7b /backend/canon-sane.c
parent2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff)
parent1edb02101a9306fc711cd422ed507d18165b1691 (diff)
Merge branch 'release/experimental/1.0.27-1_experimental1'experimental/1.0.27-1_experimental1
Diffstat (limited to 'backend/canon-sane.c')
-rw-r--r--backend/canon-sane.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/backend/canon-sane.c b/backend/canon-sane.c
index 79ce0ba..a8efc7a 100644
--- a/backend/canon-sane.c
+++ b/backend/canon-sane.c
@@ -1,5 +1,5 @@
SANE_Status
-sane_init (SANE_Int * version_code, SANE_Auth_Callback UNUSEDARG authorize)
+sane_init (SANE_Int * version_code, SANE_Auth_Callback __sane_unused__ authorize)
{
char devnam[PATH_MAX] = "/dev/scanner";
FILE *fp;
@@ -107,7 +107,7 @@ sane_exit (void)
SANE_Status
sane_get_devices (const SANE_Device *** device_list,
-SANE_Bool UNUSEDARG local_only)
+SANE_Bool __sane_unused__ local_only)
{
static const SANE_Device **devlist = 0;
CANON_Device *dev;
@@ -1104,7 +1104,6 @@ sane_get_parameters (SANE_Handle handle, SANE_Parameters *params)
SANE_Status
sane_start (SANE_Handle handle)
{
- int mode;
char *mode_str;
CANON_Scanner *s = handle;
SANE_Status status;
@@ -1301,33 +1300,27 @@ sane_start (SANE_Handle handle)
if (!strcmp (mode_str, SANE_VALUE_SCAN_MODE_LINEART))
{
- mode = 4;
s->image_composition = 0;
}
else if (!strcmp (mode_str, SANE_VALUE_SCAN_MODE_HALFTONE))
{
- mode = 4;
s->image_composition = 1;
}
else if (!strcmp (mode_str, SANE_VALUE_SCAN_MODE_GRAY))
{
- mode = 5;
s->image_composition = 2;
}
else if (!strcmp (mode_str, SANE_VALUE_SCAN_MODE_COLOR)
|| !strcmp (mode_str, SANE_I18N("Fine color")))
{
- mode = 6;
s->image_composition = 5;
}
else if (!strcmp (mode_str, SANE_I18N("Raw")))
{
- mode = 6;
s->image_composition = 5;
}
else
{
- mode = 6;
s->image_composition = 5;
}
@@ -2206,8 +2199,8 @@ sane_cancel (SANE_Handle handle)
/**************************************************************************/
SANE_Status
-sane_set_io_mode (SANE_Handle UNUSEDARG handle,
-SANE_Bool UNUSEDARG non_blocking)
+sane_set_io_mode (SANE_Handle __sane_unused__ handle,
+SANE_Bool __sane_unused__ non_blocking)
{
DBG (1, ">> sane_set_io_mode\n");
DBG (1, "<< sane_set_io_mode\n");
@@ -2217,8 +2210,8 @@ SANE_Bool UNUSEDARG non_blocking)
/**************************************************************************/
SANE_Status
-sane_get_select_fd (SANE_Handle UNUSEDARG handle,
-SANE_Int UNUSEDARG * fd)
+sane_get_select_fd (SANE_Handle __sane_unused__ handle,
+SANE_Int __sane_unused__ * fd)
{
DBG (1, ">> sane_get_select_fd\n");
DBG (1, "<< sane_get_select_fd\n");