From b3e1fcc4938dc64c2ca31a470a7090cec9c95000 Mon Sep 17 00:00:00 2001
From: Douglas Bagnall <douglas@paradise.net.nz>
Date: Thu, 17 Jun 2010 21:32:01 +1200
Subject: [PATCH] remove tricks to make calibration work

---
 edges.c | 18 ++----------------
 edges.h |  6 ------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/edges.c b/edges.c
index 72b5543..878231e 100644
--- a/edges.c
+++ b/edges.c
@@ -883,15 +883,9 @@ look_for_line(GstSparrow *sparrow, guint8 *in, sparrow_find_lines_t *fl,
   for (i = 0; i < sparrow->in.pixcount; i++){
     colour = in32[i] & cmask;
     signal = (((colour >> fl->shift1) & COLOUR_MASK) +
-            ((colour >> fl->shift2) & COLOUR_MASK));
+        ((colour >> fl->shift2) & COLOUR_MASK));
+
     if (signal){
-      int antisignal = (((colour >> fl->unshift1) & COLOUR_MASK) +
-          ((colour >> fl->unshift2) & COLOUR_MASK));
-      GST_DEBUG("colour is %x. signal %x antisignal %x", colour, signal, antisignal);
-      if (antisignal >= signal){
-        GST_DEBUG("got signal %d and antisignal %d. ignore it");
-        continue;
-      }
       if (fl->map[i].lines[line->dir] &&
           signal < 2 * fl->map[i].signal[line->dir]){
         if (fl->map[i].lines[line->dir] != BAD_PIXEL &&
@@ -1049,11 +1043,7 @@ find_corners(GstSparrow *sparrow, sparrow_find_lines_t *fl)
     calculate_deltas(sparrow, fl);
     break;
   case 0:
-#if USE_FULL_LUT
     corners_to_full_lut(sparrow, fl);
-#else
-    corners_to_lut(sparrow, fl);
-#endif
     jump_state(sparrow, fl, EDGES_NEXT_STATE);
     break;
   default:
@@ -1152,15 +1142,11 @@ setup_colour_shifts(GstSparrow *sparrow, sparrow_find_lines_t *fl){
     fl->shift1 = sparrow->in.gshift + COLOUR_QUANT;
     fl->shift2 = sparrow->in.gshift + COLOUR_QUANT;
     GST_DEBUG("using green shift: %d, %d", fl->shift1, fl->shift2);
-    fl->unshift1 = sparrow->in.rshift + COLOUR_QUANT;
-    fl->unshift2 = sparrow->in.bshift + COLOUR_QUANT;
     break;
   case SPARROW_MAGENTA:
     fl->shift1 = sparrow->in.rshift + COLOUR_QUANT;
     fl->shift2 = sparrow->in.bshift + COLOUR_QUANT;
     GST_DEBUG("using magenta shift: %d, %d", fl->shift1, fl->shift2);
-    fl->unshift1 = sparrow->in.gshift + COLOUR_QUANT;
-    fl->unshift2 = sparrow->in.gshift + COLOUR_QUANT;
     break;
   }
 }
diff --git a/edges.h b/edges.h
index ef23ef8..50989f1 100644
--- a/edges.h
+++ b/edges.h
@@ -140,8 +140,6 @@ typedef struct sparrow_find_lines_s {
   int n_hlines;
   gint shift1;
   gint shift2;
-  gint unshift1;
-  gint unshift2;
   sparrow_intersect_t *map;
   sparrow_corner_t *mesh_mem;
   sparrow_corner_t *mesh;
@@ -167,8 +165,6 @@ typedef struct sparrow_find_lines_s {
   "  int n_hlines: %d\n"                           \
   "  gint shift1: %d\n"                            \
   "  gint shift2: %d\n"                            \
-  "  gint unshift1: %d\n"                            \
-  "  gint unshift2: %d\n"                            \
   "  sparrow_intersect_t *map: %p\n"               \
   "  sparrow_corner_t *mesh: %p\n"                 \
   "  sparrow_cluster_t *clusters: %p\n"            \
@@ -188,8 +184,6 @@ typedef struct sparrow_find_lines_s {
   (fl)->n_hlines,                                  \
   (fl)->shift1,                                    \
   (fl)->shift2,                                    \
-  (fl)->unshift1,                                    \
-  (fl)->unshift2,                                    \
   (fl)->map,                                       \
   (fl)->mesh,                                      \
   (fl)->clusters,                                  \
-- 
2.11.4.GIT