X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=pctb%2Fstructure.c;h=0c9750c5f5bd45c4222db71686816dee5b86b464;hp=f8705d3903a642b7885606d8ae35a19bee16b352;hb=f364c130b3b7d2e46e6cb57e4ff39a59fb54b226;hpb=74e4e249f2c3e848592984cb193aded6a77a341d

diff --git a/pctb/structure.c b/pctb/structure.c
index f8705d3..0c9750c 100644
--- a/pctb/structure.c
+++ b/pctb/structure.c
@@ -496,8 +496,18 @@ void analyse(FILE *tsv_output) {
 
 void find_islandname(void) {
   Rect sunshiner;
-  char sunshine[MAXIMGIDENT];
-  const RgbImage *ri= page0_rgbimage;
+  char sunshine[MAXIMGIDENT], archisland[MAXIMGIDENT];
+
+  RgbImage *ri= alloc_rgb_image(page0_rgbimage->w, page0_rgbimage->h);
+  const unsigned char *srcp;
+  unsigned char *destp, *endp;
+  for (srcp=page0_rgbimage->data, destp=ri->data,
+	 endp= ri->data + 3 * ri->w * ri->h;
+       destp < endp;
+       srcp++, destp++) {
+    unsigned char c= *srcp & 0xf0;
+    *destp= c | (c>>4);
+  }
 
   cim= page_images[0];
   
@@ -517,37 +527,50 @@ void find_islandname(void) {
   ADJUST_BOX(sunshiner,"o",20,  cim->w,               MUST, br,x,+1);
   debug_rect("sunshiner",1, sunshiner);
 
-  identify_rgbimage(ri, sunshiner, sunshine);
-  fprintf(stderr,"sunshine: `%s'",sunshine);
+  identify_rgbimage(ri, sunshiner, sunshine, "sunshine widget");
+  fprintf(stderr,"sunshine: `%s'\n",sunshine);
   
-#if 0
-
-
-  islandnamer.tl.x= cim->w - 1034 +  885;
-  islandnamer.br.x= cim->w - 1034 + 1020;
-  islandnamer.tl.y=                 128;
-  islandnamer.br.y=                 156;
+  if (!memcmp(sunshine,"Ship ",5)) {
+    Rect islandnamer;
+    
+    islandnamer.tl.x= cim->w - 1034 +  885;
+    islandnamer.br.x= cim->w - 1034 + 1020;
+    islandnamer.tl.y=                 128;
+    islandnamer.br.y=                 156;
 
 #define IR_VSHRINK_MUST(CONDMUST,PRWHY) \
-  do{ if (!(CONDMUST)) goto not_in_radar; }while(0)
-
-  ADJUST_BOX(islandnamer,"o",5, IR_VSHRINK_MUST, tl,y,+1);
-  ADJUST_BOX(islandnamer,"o",5, IR_VSHRINK_MUST, br,y,-1);
-
-  debug_rect("islandnamer",0, islandnamer);
-  static int larger_islandnamebry= islandname.tl.y + 25;
-  if (islandnamer.br.y < larger_islandnamebry)
-    goto not_in_radar;
-  islandnamer.br.y = larger_islandnamebry;
-  debug_rect("islandnamer",1, islandnamer);
+    do{ if (!(CONDMUST)) goto not_in_radar; }while(0)
+
+    ADJUST_BOX(islandnamer,"o",5, 0,      IR_VSHRINK_MUST, tl,y,+1);
+    ADJUST_BOX(islandnamer,"o",5, cim->h, IR_VSHRINK_MUST, br,y,-1);
+
+    debug_rect("islandnamer",0, islandnamer);
+//    int larger_islandnamebry= islandnamer.tl.y + 25;
+//    MUST(islandnamer.br.y < larger_islandnamebry,
+//	 MR(islandnamer);MI(larger_islandnamebry));
+//    islandnamer.br.y = larger_islandnamebry;
+    debug_rect("islandnamer",1, islandnamer);
+
+    int x,y,i;
+    for (x=islandnamer.tl.x; x<=islandnamer.br.x; x++)
+      for (y=islandnamer.tl.y; y<=islandnamer.br.y; y++) {
+	if (RI_PIXEL(ri,x,y)[0] < 0x40) {
+	  for (i=0; i<3; i++) {
+	    RI_PIXEL(ri,x,y)[i]= 0;
+	  }
+	}
+      }
 
-  debug_ppmrect("islandnamer",2, islandnamer,ri);
-  
- not_in_radar:
-  
+    identify_rgbimage(ri, islandnamer, archisland, "island");
+    fprintf(stderr,"radar: `%s'\n",archisland);
 
+    assert(!"radar ok");
   
-  abort();
+  not_in_radar:
+    assert(!"not in radar?");
+  } else {
+    assert(!"not vessel");
+  }
 
-#endif
+  free(ri);
 }