Do not mention bpp in mustfail1 since we check it ourselves nowadays

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

diff --git a/pctb/structure.c b/pctb/structure.c
index 1045d19cac4a567676160c1b7b72d6d8428ede3b..859c7d91d9fa3f3e0b8722aed2f942ed7c8ec190 100644 (file)
--- a/pctb/structure.c
+++ b/pctb/structure.c
@@ -128,7 +128,6 @@ static void mustfail1(const char *file, int line, const char *what) {
  "   * YPP client is showing commodity listing screen\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"
  "\n"
  "If all of these are true, please report this as a fault.\n\n"
          "Technical details:"
@@ -156,7 +155,7 @@ static void mustfail2(void) {
 #define MRGB(v) fprintf(stderr," %s=%06lx", #v,(v))
 #define MC(v) fprintf(stderr," %s='%c'", #v,(v))
 #define MS(v) fprintf(stderr," %s=\"%s\"", #v,(v))
-#define MF(v) fprintf(stderr," %s=\"%f\"", #v,(v))
+#define MF(v) fprintf(stderr," %s=%f", #v,(v))
 #define MSB(v) fprintf(stderr," %s", (v))
 #define MR(v) fprintf(stderr," %s=%d,%d..%d,%d",\
                       #v,(v).tl.x,(v).tl.y,(v).br.x,(v).br.y)
@@ -486,11 +485,16 @@ static double find_aa_density(const RgbImage *ri, Point p, long background,
   double alpha_max= alpha_mean + thresh;
   for (i=0; i<3; i++)
     MUST( alpha_min <= alpha[i] && alpha[i] <= alpha_max,
+         MP(p);
          MRGB(here);MRGB(background);MRGB(foreground);MI(fg_extra);
          MF(alpha_min); MI(i);MF(alpha[i]);MF(alpha_max) );
 
+  if (   -1e-5 <  alpha_mean && alpha_mean <= 0.0     ) alpha_mean= 0.0;
+  if (1.0      <= alpha_mean && alpha_mean <= 1.0+1e-5) alpha_mean= 1.0;
+
   MUST( 0 <= alpha_mean &&
-       (fg_extra ? alpha_mean < 0.999 : alpha_mean >= 1.0),
+       (fg_extra ? (alpha_mean < 0.999) : (alpha_mean <= 1.0)),
+       MP(p);
        MRGB(here);MRGB(background);MRGB(foreground);MI(fg_extra);
        MF(alpha_mean); MF(alpha[0]);MF(alpha[1]);MF(alpha[2]); );
 
@@ -760,10 +764,15 @@ void find_islandname(RgbImage *ri) {
       
       for (p.y=islandnamer.tl.y; p.y<=islandnamer.br.y; p.y++) {
        pattern <<= 1;
-       switch (get_p(p)) {
-       case '*': if (runs[nruns]) { nruns++; runs[nruns]=0; }          break;
-       case 'O': runs[nruns]++;              pattern |= 1u;            break;
-       default:                              pattern |= 1UL<<31;       break;
+       double alpha= find_aa_density(ri,p, 0xCCCCAA,0x002255,0);
+       if (alpha >= 0.49) {
+          runs[nruns]++;
+          pattern |= 1u;
+       } else {
+         if (runs[nruns]) {
+           nruns++;
+           runs[nruns]=0;
+         }
        }
       }