X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fstructure.c;h=859c7d91d9fa3f3e0b8722aed2f942ed7c8ec190;hb=ce5b169e0b224fd9233736ef49eb9478d0b9f2cb;hp=139180878012d92ae6b0589c19d262c370a02a21;hpb=710699382b7be70ce8fb067a7d64102fa5153754;p=ypp-sc-tools.db-live.git

diff --git a/pctb/structure.c b/pctb/structure.c
index 1391808..859c7d9 100644
--- 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:"
@@ -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;
+	  }
 	}
       }