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

diff --git a/pctb/structure.c b/pctb/structure.c
index cb79f99..859c7d9 100644
--- a/pctb/structure.c
+++ b/pctb/structure.c
@@ -51,7 +51,12 @@ char *archipelago, *island;
 #define OTHERCOORD_x y
 #define OTHERCOORD_y x
 
-const CanonColourInfo canoncolourinfos[]= {
+typedef struct {
+  Rgb rgb; /* on screen */
+  char c; /* canonical */
+} CanonColourInfo;
+
+const CanonColourInfo canoncolourinfo_table[]= {
   { 0x475A5E, '*' }, /* edge */
   { 0x2C5F7A, '*' }, /* edge just under box heading shadow */
   { 0xC5C7AE, '*' }, /* blank area of partial commodities list */
@@ -89,6 +94,31 @@ const CanonColourInfo canoncolourinfos[]= {
   { 0,0 }
 };
 
+CanonColourInfoReds canoncolourinfo_tree;
+
+void canon_colour_prepare(void) {
+  const CanonColourInfo *cci;
+  for (cci=canoncolourinfo_table; cci->c; cci++) {
+    unsigned char r= cci->rgb >> 16;
+    unsigned char g= cci->rgb >>  8;
+    unsigned char b= cci->rgb;
+
+    CanonColourInfoGreens *greens= canoncolourinfo_tree.red2[r];
+    if (!greens) {
+      greens= canoncolourinfo_tree.red2[r]= mmalloc(sizeof(*greens));
+      FILLZERO(*greens);
+    }
+
+    CanonColourInfoBlues *blues= greens->green2[g];
+    if (!blues) {
+      blues= greens->green2[g]= mmalloc(sizeof(*blues));
+      memset(blues, '?', sizeof(blues));
+    }
+
+    blues->blue2[b]= cci->c;
+  }
+}
+
 
 static void mustfail1(const char *file, int line, const char *what) {
   fprintf(stderr,
@@ -98,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:"
@@ -126,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)
@@ -390,15 +419,13 @@ static void file_read_image_ppm(FILE *f) {
     fatal("PNM screenshot(s) file must be 8bpp 1 byte-per-sample RGB raw");
 
   CANONICALISE_IMAGE(im, inpam.width, inpam.height, {
-    int r= fread(&rgb_buf,1,3,f);
+    int rr= fread(&rgb_buf,1,3,f);
     sysassert(!ferror(f));
-    if (r!=3) fatal("PNM screenshot(s) file ends unexpectedly");
-
-    rgb=
-	((unsigned long)rgb_buf[0]<<16) |
-	((unsigned long)rgb_buf[1]<<8) |
-	               (rgb_buf[2]);
+    if (rr!=3) fatal("PNM screenshot(s) file ends unexpectedly");
 
+    r= rgb_buf[0];
+    g= rgb_buf[1];
+    b= rgb_buf[2];
   });
 
   sysassert(!ferror(screenshot_file));
@@ -436,6 +463,44 @@ void read_screenshots(void) {
   progress_log("read %d screenshots.",npages);
 }
 
+static double find_aa_density(const RgbImage *ri, Point p, long background,
+			      long foreground, int fg_extra) {
+  Rgb here= ri_rgb(ri, p.x, p.y);
+
+  double alpha[3], alpha_mean=0;
+  int i;
+  for (i=0; i<3; i++) {
+    unsigned char here_chan= here       >> (i*8);
+    unsigned char bg_chan=   background >> (i*8);
+    unsigned char fg_chan=   foreground >> (i*8);
+    double alpha_chan=
+      ((double)here_chan    - (double)bg_chan) /
+      ((fg_chan + fg_extra) - (double)bg_chan);
+    alpha[i]= alpha_chan;
+    alpha_mean += alpha_chan * (1/3.0);
+  }
+
+  double thresh= 1.5/AAMAXVAL;
+  double alpha_min= alpha_mean - thresh;
+  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)),
+	MP(p);
+	MRGB(here);MRGB(background);MRGB(foreground);MI(fg_extra);
+	MF(alpha_mean); MF(alpha[0]);MF(alpha[1]);MF(alpha[2]); );
+
+  return alpha_mean;
+}
+
 static void find_commodity(int offset, Rect *rr) {
   /* rr->tl.x==-1 if offset out of range */
   rr->tl.y= commbasey - offset*comminty;
@@ -496,32 +561,9 @@ static void find_table_entry(Rect commod, int colno, Rect *cell) {
   int monochrome= 1;
 
   FOR_P_RECT(p,*cell) {
-    Rgb here= ri_rgb(ri, p.x, p.y);
-    double alpha[3], alpha_mean=0;
-    int i;
-    for (i=0; i<3; i++) {
-      unsigned char here_chan= here       >> (i*8);
-      unsigned char bg_chan=   background >> (i*8);
-      unsigned char fg_chan=   foreground >> (i*8);
-      double alpha_chan=
-	((double)here_chan    - (double)bg_chan) /
-	((fg_chan + fg_extra) - (double)bg_chan);
-      alpha[i]= alpha_chan;
-      alpha_mean += alpha_chan * (1/3.0);
-    }
+    double alpha= find_aa_density(ri,p,background,foreground,fg_extra);
 
-    double thresh= 1.5/AAMAXVAL;
-    double alpha_min= alpha_mean - thresh;
-    double alpha_max= alpha_mean + thresh;
-    for (i=0; i<3; i++)
-      MUST( alpha_min <= alpha[i] && alpha[i] <= alpha_max,
-	    MI(i);MRGB(here);MRGB(background);MRGB(foreground);
-	    MF(alpha_min);MF(alpha[i]);MF(alpha_max) );
-
-    MUST( 0 <= alpha_mean && alpha_mean < 0.999,
-	  MRGB(here);MRGB(background);MRGB(foreground);
-	  MF(alpha_mean); MF(alpha[0]);MF(alpha[1]);MF(alpha[2]); );
-    int here_int= floor((AAMAXVAL+1)*alpha_mean);
+    int here_int= floor((AAMAXVAL+1)*alpha);
     assert(here_int <= AAMAXVAL);
     if (!(here_int==0 || here_int==AAMAXVAL)) monochrome=0;
     cim->d[p.y * cim->w + p.x]= '0' + here_int;
@@ -722,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;
+	  }
 	}
       }