mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

separate x-resolution from resolution, and update all backends that use 

it, to prevent ui change
merge-requests/1/head
m. allan noah 2008-07-26 03:53:44 +00:00
rodzic 747c868405
commit 2dc0cb38bd
10 zmienionych plików z 21 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
ChangeLog
Wyświetl plik

@ -1,3 +1,10 @@
2008-07-25 m. allan noah <kitno455 a t gmail d o t com>
* include/sane/saneopts.h: separate x-resolution from resolution
* backend/abaton.c, backend/artec.c, backend/canon-sane.c,
backend/epjitsu.c, backend/fujitsu.c, backend/microtek2.c,
backend/sp15c.c, backend/umax.c: use SANE_NAME_SCAN_RESOLUTION
instead of SANE_NAME_SCAN_X_RESOLUTION, to avoid ui change
2008-07-20 Julien Blache <jb@jblache.org> 2008-07-20 Julien Blache <jb@jblache.org>
* backend/net.c: sane_control_option: when the frontend doesn't * backend/net.c: sane_control_option: when the frontend doesn't
care (info == NULL) and the remote backend asks for a reload, care (info == NULL) and the remote backend asks for a reload,

2
backend/abaton.c
Wyświetl plik

@ -686,7 +686,7 @@ init_options (Abaton_Scanner * s)
s->val[OPT_MODE].s = strdup (mode_list[0]); s->val[OPT_MODE].s = strdup (mode_list[0]);
/* resolution - horizontal */ /* resolution - horizontal */
s->opt[OPT_X_RESOLUTION].name = SANE_NAME_SCAN_X_RESOLUTION; s->opt[OPT_X_RESOLUTION].name = SANE_NAME_SCAN_RESOLUTION;
s->opt[OPT_X_RESOLUTION].title = SANE_TITLE_SCAN_X_RESOLUTION; s->opt[OPT_X_RESOLUTION].title = SANE_TITLE_SCAN_X_RESOLUTION;
s->opt[OPT_X_RESOLUTION].desc = SANE_DESC_SCAN_X_RESOLUTION; s->opt[OPT_X_RESOLUTION].desc = SANE_DESC_SCAN_X_RESOLUTION;
s->opt[OPT_X_RESOLUTION].type = SANE_TYPE_INT; s->opt[OPT_X_RESOLUTION].type = SANE_TYPE_INT;

2
backend/artec.c
Wyświetl plik

@ -3047,7 +3047,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
s->opt[OPT_X_RESOLUTION].title = s->opt[OPT_X_RESOLUTION].title =
SANE_TITLE_SCAN_X_RESOLUTION; SANE_TITLE_SCAN_X_RESOLUTION;
s->opt[OPT_X_RESOLUTION].name = s->opt[OPT_X_RESOLUTION].name =
SANE_NAME_SCAN_X_RESOLUTION; SANE_NAME_SCAN_RESOLUTION;
s->opt[OPT_X_RESOLUTION].desc = s->opt[OPT_X_RESOLUTION].desc =
SANE_DESC_SCAN_X_RESOLUTION; SANE_DESC_SCAN_X_RESOLUTION;
} }

2
backend/canon-sane.c
Wyświetl plik

@ -507,7 +507,7 @@ sane_control_option (SANE_Handle handle, SANE_Int option,
s->opt[OPT_Y_RESOLUTION].cap &= ~SANE_CAP_INACTIVE; s->opt[OPT_Y_RESOLUTION].cap &= ~SANE_CAP_INACTIVE;
s->opt[OPT_X_RESOLUTION].title = s->opt[OPT_X_RESOLUTION].title =
SANE_TITLE_SCAN_X_RESOLUTION; SANE_TITLE_SCAN_X_RESOLUTION;
s->opt[OPT_X_RESOLUTION].name = SANE_NAME_SCAN_X_RESOLUTION; s->opt[OPT_X_RESOLUTION].name = SANE_NAME_SCAN_RESOLUTION;
s->opt[OPT_X_RESOLUTION].desc = SANE_DESC_SCAN_X_RESOLUTION; s->opt[OPT_X_RESOLUTION].desc = SANE_DESC_SCAN_X_RESOLUTION;
} }
else else

2
backend/epjitsu.c
Wyświetl plik

@ -898,7 +898,7 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
} }
s->x_res_list[0] = i; s->x_res_list[0] = i;
opt->name = SANE_NAME_SCAN_X_RESOLUTION; opt->name = SANE_NAME_SCAN_RESOLUTION;
opt->title = SANE_TITLE_SCAN_X_RESOLUTION; opt->title = SANE_TITLE_SCAN_X_RESOLUTION;
opt->desc = SANE_DESC_SCAN_X_RESOLUTION; opt->desc = SANE_DESC_SCAN_X_RESOLUTION;
opt->type = SANE_TYPE_INT; opt->type = SANE_TYPE_INT;

2
backend/fujitsu.c
Wyświetl plik

@ -2279,7 +2279,7 @@ sane_get_option_descriptor (SANE_Handle handle, SANE_Int option)
} }
s->x_res_list[0] = i; s->x_res_list[0] = i;
opt->name = SANE_NAME_SCAN_X_RESOLUTION; opt->name = SANE_NAME_SCAN_RESOLUTION;
opt->title = SANE_TITLE_SCAN_X_RESOLUTION; opt->title = SANE_TITLE_SCAN_X_RESOLUTION;
opt->desc = SANE_DESC_SCAN_X_RESOLUTION; opt->desc = SANE_DESC_SCAN_X_RESOLUTION;
opt->type = SANE_TYPE_INT; opt->type = SANE_TYPE_INT;

2
backend/microtek2.c
Wyświetl plik

@ -2425,7 +2425,7 @@ init_options(Microtek2_Scanner *ms, u_int8_t current_scan_source)
sod[OPT_HALFTONE].constraint.string_list = md->halftone_mode_list; sod[OPT_HALFTONE].constraint.string_list = md->halftone_mode_list;
/* Resolution */ /* Resolution */
sod[OPT_RESOLUTION].name = SANE_NAME_SCAN_X_RESOLUTION; sod[OPT_RESOLUTION].name = SANE_NAME_SCAN_RESOLUTION;
sod[OPT_RESOLUTION].title = SANE_TITLE_SCAN_X_RESOLUTION; sod[OPT_RESOLUTION].title = SANE_TITLE_SCAN_X_RESOLUTION;
sod[OPT_RESOLUTION].desc = SANE_DESC_SCAN_X_RESOLUTION; sod[OPT_RESOLUTION].desc = SANE_DESC_SCAN_X_RESOLUTION;
sod[OPT_RESOLUTION].unit = SANE_UNIT_DPI; sod[OPT_RESOLUTION].unit = SANE_UNIT_DPI;

8
backend/sp15c.c
Wyświetl plik

@ -45,7 +45,11 @@ static const char RCSid[] = "$Header$";
/* /*
* $Log$ * $Log$
* Revision 1.15 2007/11/18 10:59:18 ellert-guest * Revision 1.16 2008/07/26 03:53:44 kitno-guest
* separate x-resolution from resolution, and update all backends that use
* it, to prevent ui change
*
* Revision 1.15 2007-11-18 10:59:18 ellert-guest
* Fix handling of valid "negative" PIDs * Fix handling of valid "negative" PIDs
* *
* Revision 1.14 2007-10-26 14:56:38 jblache * Revision 1.14 2007-10-26 14:56:38 jblache
@ -1441,7 +1445,7 @@ init_options (struct sp15c *scanner)
scanner->opt[OPT_PRESCAN].unit = SANE_UNIT_NONE; scanner->opt[OPT_PRESCAN].unit = SANE_UNIT_NONE;
/* resolution */ /* resolution */
scanner->opt[OPT_X_RES].name = SANE_NAME_SCAN_X_RESOLUTION; scanner->opt[OPT_X_RES].name = SANE_NAME_SCAN_RESOLUTION;
scanner->opt[OPT_X_RES].title = SANE_TITLE_SCAN_X_RESOLUTION; scanner->opt[OPT_X_RES].title = SANE_TITLE_SCAN_X_RESOLUTION;
scanner->opt[OPT_X_RES].desc = SANE_DESC_SCAN_X_RESOLUTION; scanner->opt[OPT_X_RES].desc = SANE_DESC_SCAN_X_RESOLUTION;
scanner->opt[OPT_X_RES].type = SANE_TYPE_INT; scanner->opt[OPT_X_RES].type = SANE_TYPE_INT;

2
backend/umax.c
Wyświetl plik

@ -6740,7 +6740,7 @@ SANE_Status sane_control_option(SANE_Handle handle, SANE_Int option, SANE_Action
{ /* don't bind */ { /* don't bind */
scanner->opt[OPT_Y_RESOLUTION].cap &= ~SANE_CAP_INACTIVE; scanner->opt[OPT_Y_RESOLUTION].cap &= ~SANE_CAP_INACTIVE;
scanner->opt[OPT_X_RESOLUTION].title = SANE_TITLE_SCAN_X_RESOLUTION; scanner->opt[OPT_X_RESOLUTION].title = SANE_TITLE_SCAN_X_RESOLUTION;
scanner->opt[OPT_X_RESOLUTION].name = SANE_NAME_SCAN_X_RESOLUTION; scanner->opt[OPT_X_RESOLUTION].name = SANE_NAME_SCAN_RESOLUTION;
scanner->opt[OPT_X_RESOLUTION].desc = SANE_DESC_SCAN_X_RESOLUTION; scanner->opt[OPT_X_RESOLUTION].desc = SANE_DESC_SCAN_X_RESOLUTION;
} }
else else

2
include/sane/saneopts.h
Wyświetl plik

@ -84,7 +84,7 @@
#define SANE_NAME_SCAN_BR_X "br-x" #define SANE_NAME_SCAN_BR_X "br-x"
#define SANE_NAME_SCAN_BR_Y "br-y" #define SANE_NAME_SCAN_BR_Y "br-y"
#define SANE_NAME_SCAN_RESOLUTION "resolution" #define SANE_NAME_SCAN_RESOLUTION "resolution"
#define SANE_NAME_SCAN_X_RESOLUTION "resolution" #define SANE_NAME_SCAN_X_RESOLUTION "x-resolution"
#define SANE_NAME_SCAN_Y_RESOLUTION "y-resolution" #define SANE_NAME_SCAN_Y_RESOLUTION "y-resolution"
#define SANE_NAME_PAGE_WIDTH "page-width" #define SANE_NAME_PAGE_WIDTH "page-width"
#define SANE_NAME_PAGE_HEIGHT "page-height" #define SANE_NAME_PAGE_HEIGHT "page-height"