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

added TL_X < BR_X and TL_Y < BR_Y consistency check

DEVEL_2_0_BRANCH-1
Simon Munton 2002-07-23 21:09:30 +00:00
rodzic 9d4f88844d
commit 7f6ea34a85
1 zmienionych plików z 22 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

23
backend/pie.c
Wyświetl plik

@ -43,6 +43,8 @@
If you do not wish that, delete this exception notice. */
/*
* 23-7-2002 added TL_X > BR_X, TL_Y > BR_Y check in sane_start
*
* 17-9-2001 changed ADLIB to AdLib as the comparison is case sensitive and
* the scanner returns AdLib
*
@ -103,7 +105,7 @@
#define DBG_sane_option 13
#define DBG_dump 14
#define BUILD 7
#define BUILD 8
#define PIE_CONFIG_FILE "pie.conf"
#define MM_PER_INCH 25.4
@ -3495,6 +3497,25 @@ sane_start (SANE_Handle handle)
DBG (DBG_sane_init, "sane_start\n");
/* Check for inconsistencies */
if (scanner->val[OPT_TL_X].w > scanner->val[OPT_BR_X].w)
{
DBG (0, "sane_start: %s (%.1f mm) is bigger than %s (%.1f mm) "
"-- aborting\n",
scanner->opt[OPT_TL_X].title, SANE_UNFIX (scanner->val[OPT_TL_X].w),
scanner->opt[OPT_BR_X].title, SANE_UNFIX (scanner->val[OPT_BR_X].w));
return SANE_STATUS_INVAL;
}
if (scanner->val[OPT_TL_Y].w > scanner->val[OPT_BR_Y].w)
{
DBG (0, "sane_start: %s (%.1f mm) is bigger than %s (%.1f mm) "
"-- aborting\n",
scanner->opt[OPT_TL_Y].title, SANE_UNFIX (scanner->val[OPT_TL_Y].w),
scanner->opt[OPT_BR_Y].title, SANE_UNFIX (scanner->val[OPT_BR_Y].w));
return SANE_STATUS_INVAL;
}
mode = scanner->val[OPT_MODE].s;
if (scanner->sfd < 0) /* first call, don`t run this routine again on multi frame or multi image scan */