Fix max aa channel deviation [-iwj]

[ypp-sc-tools.db-live.git] / pctb / structure.c

diff --git a/pctb/structure.c b/pctb/structure.c
index da80cb9fda86297b74e57f8e6a37ec7a887244bd..2bb6429602fdc790f6fb76a87c5a23e47c06f638 100644 (file)
--- a/pctb/structure.c
+++ b/pctb/structure.c
@@ -96,7 +96,6 @@ static void mustfail1(const char *file, int line, const char *what) {
  "Unable to figure out contents of YPP client display.\n"
  "Please check the following:\n"
  "   * YPP client is showing commodity listing screen\n"
- "   * YPP client has antialiased text turned off (Ye / Options / General)\n"
  "   * YPP client window is on top (we try to raise it but your window\n"
  "      manager might have prevented that from succeeding)\n"
  "   * Your X display is 24bpp (NB some VNC servers use 16bpp by default)\n"
@@ -462,28 +461,30 @@ static void find_table_entry(Rect commod, int colno, Rect *cell) {
   const RgbImage *ri= cim->rgb;
   
   Rgb background= ri_rgb(ri, cell->br.x, cell->br.y);
-  long bg_count=0, white_count=0, black_count=0;
+  long bg_count=0, light_count=0, dark_count=0;
   Point p;
   FOR_P_RECT(p,*cell) {
     Rgb here= ri_rgb(ri, p.x, p.y);
     if (here == background) bg_count++;
-    else if (here == 0) black_count++;
-    else if (here == 0xffffffU) white_count++;
+    else if (here < background) dark_count++;
+    else if (here > background) light_count++;
   }
   long total_count= RECT_W(*cell) * RECT_H(*cell);
-  MUST( bg_count > 8*total_count / 10,
-       MR(*cell);MIL(bg_count);MIL(white_count);MIL(black_count) );
+  MUST( bg_count > total_count / 2,
+       MR(*cell);MIL(total_count);MIL(bg_count);
+       MIL(light_count);MIL(dark_count) );
   if (bg_count == total_count)
     return;
 
-  MUST( !!black_count != !!white_count,
-       MR(*cell);MIL(bg_count);MIL(white_count);MIL(black_count) );
+  MUST( !!dark_count != !!light_count,
+       MR(*cell);MIL(total_count);MIL(bg_count);
+       MIL(light_count);MIL(dark_count) );
 
-  debugf("TABLEENTRY col=%d %d,%d..%d,%d bg=%ld white=%ld black=%ld\n",
+  debugf("TABLEENTRY col=%d %d,%d..%d,%d bg=%ld light=%ld dark=%ld\n",
         colno, cell->tl.x,cell->tl.y, cell->br.x,cell->br.y,
-        bg_count, white_count, black_count);
+        bg_count, light_count, dark_count);
   
-  Rgb foreground= white_count ? 0xffffffU : 0;
+  Rgb foreground= light_count ? 0xffffffU : 0;
   int monochrome= 1;
 
   FOR_P_RECT(p,*cell) {
@@ -501,7 +502,7 @@ static void find_table_entry(Rect commod, int colno, Rect *cell) {
       alpha_mean += alpha_chan * (1/3.0);
     }
 
-    double thresh= 1.0/AAMAXVAL;
+    double thresh= 1.5/AAMAXVAL;
     double alpha_min= alpha_mean - thresh;
     double alpha_max= alpha_mean + thresh;
     for (i=0; i<3; i++)