From 97eeb13f6ee6bc96e54b219470343dd3cfd8e009 Mon Sep 17 00:00:00 2001 From: Jonathan Bravo Lopez Date: Fri, 21 Dec 2007 13:10:19 +0000 Subject: [PATCH] Fixed bug which made slide/negative scans unusable and changed area constrains for some hp3900 scanners --- backend/hp3900.c | 2 +- backend/hp3900_config.c | 6 +++--- backend/hp3900_rts8822.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/hp3900.c b/backend/hp3900.c index 459f5d571..be3eebcd4 100644 --- a/backend/hp3900.c +++ b/backend/hp3900.c @@ -43,7 +43,7 @@ /* Backend info */ #define BACKEND_NAME hp3900 -#define BACKEND_VRSN "0.10" +#define BACKEND_VRSN "0.11" #define BACKEND_AUTHOR "Jonathan Bravo Lopez (JKD)" #define BACKEND_EMAIL "jkdsoft@gmail.com" #define BACKEND_URL "http://jkdsoftware.dyndns.org" diff --git a/backend/hp3900_config.c b/backend/hp3900_config.c index 6b6f597b4..427638614 100644 --- a/backend/hp3900_config.c +++ b/backend/hp3900_config.c @@ -980,12 +980,12 @@ static SANE_Int cfg_constrains_get(struct st_constrains *constrain) /*device , reflective , negative , transparent */ /* , {{left, width, top, height}, {left, width, top, height}, {left, width, top, height}}}, */ { BQ5550 , {{ 0, 220, 0, 300}, { 88, 42, 0, 83}, { 88, 42, 0, 83}}}, - { HP3800 , {{ 0, 220, 0, 300}, { 88, 42, 0, 83}, { 88, 42, 0, 83}}}, + { HP3800 , {{ 0, 220, 0, 300}, { 89, 45, 0, 85}, { 89, 45, 0, 100}}}, { HP3970 , {{ 0, 220, 0, 300}, { 88, 42, 0, 83}, { 88, 42, 0, 83}}}, { HP4070 , {{ 0, 220, 0, 300}, { 58, 99, 0, 197}, { 58, 99, 0, 197}}}, - { HP4370 , {{ 0, 220, 0, 300}, { 88, 42, 0, 83}, { 88, 42, 0, 83}}}, + { HP4370 , {{ 0, 220, 0, 300}, { 90, 45, 0, 85}, { 90, 45, 0, 100}}}, { UA4900 , {{ 0, 220, 0, 300}, { 88, 42, 0, 83}, { 88, 42, 0, 83}}}, - {HPG3010 , {{ 0, 220, 0, 300}, { 88, 42, 0, 83}, { 88, 42, 0, 83}}} + {HPG3010 , {{ 0, 220, 0, 300}, { 90, 45, 0, 85}, { 89, 45, 0, 100}}} }; if (constrain != NULL) diff --git a/backend/hp3900_rts8822.c b/backend/hp3900_rts8822.c index 45afb5d15..ff1045b45 100644 --- a/backend/hp3900_rts8822.c +++ b/backend/hp3900_rts8822.c @@ -11021,7 +11021,7 @@ GetOneLineInfo (struct st_device *dev, SANE_Int resolution, if (Regs != NULL) { /* Copy scanner registers */ - memcpy (Regs, &dev->init_regs, RT_BUFFER_LEN * sizeof (SANE_Byte)); + memcpy (Regs, dev->init_regs, RT_BUFFER_LEN * sizeof (SANE_Byte)); /* Setting some registers */ for (a = 0x192; a <= 0x19d; a++)