Correct bugs in new AA table cell structure parsing

diff --git a/pctb/dictionary-manager b/pctb/dictionary-manager
index 5079defd1d00abfbc9995a6f439f21efe95758ba..833e7270de29506b1a518c8b2e432191047d5bee 100755 (executable)
--- a/pctb/dictionary-manager
+++ b/pctb/dictionary-manager
@@ -25,9 +25,10 @@
 # sponsored by Three Rings.
 
 
-# ./dictionary-manager --approve-updates ijackson@login.chiark.greenend.org.uk /home/ijackson/things/ypp-sc-tools.pctb-dict-test/pctb /home/ftp/users/ijackson/pctb/test
 # ./dictionary-manager --approve-updates ijackson@login.chiark.greenend.org.uk /home/ijackson/things/ypp-sc-tools.pctb-dict/pctb /home/ftp/users/ijackson/pctb
 
+# ./dictionary-manager --approve-updates ijackson@login.chiark.greenend.org.uk /home/ijackson/things/ypp-sc-tools.pctb-dict-test/pctb /home/ftp/users/ijackson/pctb/test
+
 # ./dictionary-manager --approve-updates '' . .
 
 

diff --git a/pctb/structure.c b/pctb/structure.c
index da80cb9fda86297b74e57f8e6a37ec7a887244bd..9d92877c6e5b6a6fc23c42ce4332ed27d0c8112b 100644 (file)
--- a/pctb/structure.c
+++ b/pctb/structure.c
@@ -462,28 +462,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) {