From 63fa40d277213fbcfd498d1345af2e4ed2249d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Voltz?= Date: Mon, 18 Sep 2006 04:59:52 +0000 Subject: [PATCH] - fixed color calibration for 1220P, whit is really white, no more greenish tint - mail address update --- ChangeLog | 5 +++++ backend/umax_pp.c | 6 +++--- backend/umax_pp_low.c | 6 +++--- backend/umax_pp_mid.c | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41d72ce43..3fcf847ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-09-18 Stephane Voltz + + * backend/umax_pp.c backend/umax_pp_mid.c backend/umax_pp.c_low: + color calibration fix. Mail address update. + 2006-09-14 Henning Meier-Geinitz * doc/descriptions/unsupported.desc diff --git a/backend/umax_pp.c b/backend/umax_pp.c index 80d927c53..40e9136ac 100644 --- a/backend/umax_pp.c +++ b/backend/umax_pp.c @@ -1,5 +1,5 @@ /* sane - Scanner Access Now Easy. - Copyright (C) 2001 Stéphane Voltz + Copyright (C) 2001-2006 Stéphane Voltz This file is part of the SANE package. This program is free software; you can redistribute it and/or @@ -106,8 +106,8 @@ * see Changelog */ -#define UMAX_PP_BUILD 604 -#define UMAX_PP_STATE "dev" +#define UMAX_PP_BUILD 610 +#define UMAX_PP_STATE "stable" static int num_devices = 0; static Umax_PP_Descriptor *devlist = NULL; diff --git a/backend/umax_pp_low.c b/backend/umax_pp_low.c index 0c720ba20..4a146b80d 100644 --- a/backend/umax_pp_low.c +++ b/backend/umax_pp_low.c @@ -1,5 +1,5 @@ /** - Copyright (C) 2001 Stéphane Voltz + Copyright (C) 2001-2006 Stéphane Voltz This file is part of the SANE package. This program is free software; you can redistribute it and/or @@ -9942,7 +9942,7 @@ evalGain (int sum, int count) pct = gn; avg = exp((-pct)/area)*coeff+cnst; gn = gn * avg; - + /* bound checking : there are sightings of >127 values being negative */ if (gn < 0) gn = 0; @@ -12777,7 +12777,7 @@ coarseGainCalibration1220p (int color, int dcRed, int dcGreen, for (i = xstart; i < xend; i++) sum += buffer[i]; sum = sum / (xend - xstart); - while ((opsc04[6] < 0x07) && (sum < 120)) + while ((opsc04[6] < 0x07) && (sum < 110)) { CMDSYNC (0x00); opsc04[6]++; diff --git a/backend/umax_pp_mid.c b/backend/umax_pp_mid.c index 5bf3c9880..f6609461b 100644 --- a/backend/umax_pp_mid.c +++ b/backend/umax_pp_mid.c @@ -1,5 +1,5 @@ /* sane - Scanner Access Now Easy. - Copyright (C) 2001 Stéphane Voltz + Copyright (C) 2001-2006 Stéphane Voltz This file is part of the SANE package. This program is free software; you can redistribute it and/or