From 62fcc842f7446f9ae32e956828a49b36700750b4 Mon Sep 17 00:00:00 2001 From: "m. allan noah" Date: Thu, 5 Mar 2009 17:13:21 +0000 Subject: [PATCH] set initial scan area dimensions to maximum, close bug 311313 --- ChangeLog | 3 +++ backend/umax1220u.c | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4dad77839..5c97eb56c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2009-03-05 m. allan noah + * backend/umax1220u.c: set initial scan area dimensions to maximum + 2009-03-05 Chris Bagwell * configure.in: Allow user to disable latex support; original patch from Johnson Earls. diff --git a/backend/umax1220u.c b/backend/umax1220u.c index 40d36a685..e04d90854 100644 --- a/backend/umax1220u.c +++ b/backend/umax1220u.c @@ -43,7 +43,7 @@ whether to permit this exception to apply to your modifications. If you do not wish that, delete this exception notice. */ -#define BUILD 1 +#define BUILD 2 #define MM_IN_INCH 25.4 #include "../include/sane/config.h" @@ -376,7 +376,8 @@ optionTopLeftYCallback (SANE_Option * option, SANE_Handle handle, This option controls the bot-right-x corner of the scan */ -static SANE_Fixed optionBotRightXValue = 0; +static SANE_Fixed optionBotRightXValue + = SANE_FIX (UMAX_MAX_WIDTH * MM_IN_INCH / 600); static SANE_Option_Descriptor optionBotRightXDescriptor = { SANE_NAME_SCAN_BR_X, @@ -418,7 +419,8 @@ optionBotRightXCallback (SANE_Option * option, SANE_Handle handle, This option controls the bot-right-y corner of the scan */ -static SANE_Fixed optionBotRightYValue = 0; +static SANE_Fixed optionBotRightYValue + = SANE_FIX (UMAX_MAX_HEIGHT * MM_IN_INCH / 600); static SANE_Option_Descriptor optionBotRightYDescriptor = { SANE_NAME_SCAN_BR_Y,