From aec8271689a845561df3ca1529a2ebbbb62b6553 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Voltz?= <stef.dev@free.fr>
Date: Wed, 26 May 2010 21:07:13 +0200
Subject: [PATCH] shadarea improvements

---
 backend/genesys.c       | 10 ++++++++++
 backend/genesys_gl847.c |  6 ++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/backend/genesys.c b/backend/genesys.c
index ef7222a6a..13e99d7d4 100644
--- a/backend/genesys.c
+++ b/backend/genesys.c
@@ -3123,12 +3123,16 @@ compute_averaged_planar (Genesys_Device * dev,
 	    val = (dk * target_bright - br * target_dark) / (target_bright
 							     - target_dark);
 
+#if 0
 	  /*fill all pixels, even if only the last one is relevant */
 	  for (i = 0; i < avgpixels; i++)
 	    {
 	      shading_data[(x + o + i) * 2 * 2 + words_per_color * 2 * j] = val & 0xff;
 	      shading_data[(x + o + i) * 2 * 2 + words_per_color * 2 * j + 1] = val >> 8;
 	    }
+#endif
+	  shading_data[(x/avgpixels) * 2 * 2 + words_per_color * 2 * j] = val & 0xff;
+	  shading_data[(x/avgpixels) * 2 * 2 + words_per_color * 2 * j + 1] = val >> 8;
 
 	  val = br - dk;
 
@@ -3137,14 +3141,19 @@ compute_averaged_planar (Genesys_Device * dev,
 	  else
 	    val = 65535;
 
+#if 0
 	  /*fill all pixels, even if only the last one is relevant */
 	  for (i = 0; i < avgpixels; i++)
 	    {
 	      shading_data[(x + o + i) * 2 * 2 + words_per_color * 2 * j + 2] = val & 0xff;
 	      shading_data[(x + o + i) * 2 * 2 + words_per_color * 2 * j + 3] = val >> 8;
 	    }
+#endif
+	      shading_data[(x/avgpixels) * 2 * 2 + words_per_color * 2 * j + 2] = val & 0xff;
+	      shading_data[(x/avgpixels) * 2 * 2 + words_per_color * 2 * j + 3] = val >> 8;
 	}
 
+#if 0
       /*fill remaining channels */
       for (j = channels; j < 3; j++)
 	{
@@ -3163,6 +3172,7 @@ compute_averaged_planar (Genesys_Device * dev,
 			       * 2 * 0 + 3];
 	    }
 	}
+#endif
     }
 }
 
diff --git a/backend/genesys_gl847.c b/backend/genesys_gl847.c
index 2f15a9356..fe02724d5 100644
--- a/backend/genesys_gl847.c
+++ b/backend/genesys_gl847.c
@@ -465,7 +465,6 @@ gl847_init_registers (Genesys_Device * dev)
   SETREG (0x17, 0x08);
   SETREG (0x18, 0x00);
   SETREG (0x19, 0x50);
-  SETREG (0x19, 0x01); /* XXX STEF XXX */
   SETREG (0x1a, 0x34);
   SETREG (0x1b, 0x00);
   SETREG (0x1c, 0x02);
@@ -528,7 +527,7 @@ gl847_init_registers (Genesys_Device * dev)
   /* NOTE: autoconf is a non working option */
   SETREG (0x87, 0x02);
   SETREG (0x9d, 0x06);
-  SETREG (0x9d, 0x00); /* XXX STEF XXX 1x multiplier instead of 8x */
+  SETREG (0x9d, 0x00); /* 1x multiplier instead of 8x */
   SETREG (0xa2, 0x0f);
   SETREG (0xa6, 0x04);
   SETREG (0xbd, 0x18);
@@ -1573,7 +1572,7 @@ gl847_init_optical_regs_scan (Genesys_Device * dev,
 
   dev->bpl = words_per_line*(depth/8);
   dev->cur=0;
-  dev->len=pixels/2;
+  dev->len=((pixels*dpiset)/gl847_get_dpihw (dev))/2;
   dev->dist=dev->bpl/2;
   dev->skip=((start*dpiset)/gl847_get_dpihw (dev))/2;
   if(dev->skip>=dev->dist)
@@ -2316,7 +2315,6 @@ gl847_set_lamp_power (Genesys_Device * dev,
       r = sanei_genesys_get_address (regs, 0x19);
       r->value = 0x50;
       r->value = 0xff;
-      r->value = 0x50; /* XXX STEF XXX */
     }
   else
     {