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

diff --git a/pctb/structure.c b/pctb/structure.c
index 9b4c0b9..f8705d3 100644
--- a/pctb/structure.c
+++ b/pctb/structure.c
@@ -27,7 +27,7 @@
 
 #include "structure.h"
 
-static CanonImage *cim;
+static const CanonImage *cim;
 
 static inline char get(int x, int y) { return cim->d[y * cim->w + x]; }
 static inline char get_p(Point p) { return get(p.x,p.y); }
@@ -93,7 +93,8 @@ static void mustfail1(const char *file, int line, const char *what) {
 	  " Check that your client is logged in has the correct display.\n"
 	  " If that isn't the problem, please report this as a fault.\n\n"
 	  "Technical details:"
-	  " %s:%d: requirement failed: %s\n",
+	  " %s:%d: requirement failed:\n"
+	  " %s\n",
 	  file, line, what);
 }
 static void mustfail2(void) NORET;
@@ -173,9 +174,9 @@ static void debug_rect(const char *what, int whati, Rect rr) {
     LIMIT_MUST( (search).tl.XY != (search).br.XY &&			   \
 		(search).tl.XY != (lim),				   \
 		MR((search));MSB(#TLBR);MSB(#XY) );			   \
-    int got;								   \
-    Point p;								   \
-    for (p=(search).tl, got=0;						   \
+    int got=0;								   \
+    Point p=(search).tl;						   \
+    for (p.XY=(search).TLBR.XY;						   \
 	 p.OTHERCOORD_##XY <= (search).br.OTHERCOORD_##XY;		   \
 	 p.OTHERCOORD_##XY++)						   \
       got += !!strchr(insidechrs, get_p(p));				   \
@@ -184,7 +185,7 @@ static void debug_rect(const char *what, int whati, Rect rr) {
     (search).TLBR.XY += increm;						   \
   }
 
-void find_structure_commod(CanonImage *im, int *max_relevant_y_r) {
+void find_structure(const CanonImage *im, int *max_relevant_y_r) {
   cim= im;
   
   Rect whole = { {0,0}, {cim->w-1,cim->h-1} };
@@ -342,6 +343,7 @@ static void file_read_image_ppm(FILE *f) {
   struct pam inpam;
   unsigned char rgb_buf[3];
   CanonImage *im;
+  RgbImage *ri=0;
 
   pnm_readpaminit(f, &inpam, sizeof(inpam));
   if (!(inpam.maxval == 255 &&
@@ -349,6 +351,9 @@ static void file_read_image_ppm(FILE *f) {
 	inpam.format == RPPM_FORMAT))
     fatal("PNM screenshot(s) file must be 8bpp 1 byte per sample RGB");
 
+  if (!npages)
+    page0_rgbimage= ri= alloc_rgb_image(inpam.width, inpam.height);
+
   CANONICALISE_IMAGE(im, inpam.width, inpam.height, {
     int r= fread(&rgb_buf,1,3,f);
     sysassert(!ferror(f));
@@ -358,6 +363,9 @@ static void file_read_image_ppm(FILE *f) {
 	((unsigned long)rgb_buf[0]<<16) |
 	((unsigned long)rgb_buf[1]<<8) |
 	               (rgb_buf[2]);
+
+    if (ri)
+      CANONIMG_ALSO_STORERGB(ri);
   });
 
   sysassert(!ferror(screenshot_file));
@@ -452,7 +460,7 @@ void analyse(FILE *tsv_output) {
   int page, tryrect, colno;
 
   for (page=0; page<npages; page++) {
-    find_structure_commod(page_images[page], 0);
+    find_structure(page_images[page], 0);
 
     if (!page)
       check_correct_commodities();
@@ -484,32 +492,36 @@ void analyse(FILE *tsv_output) {
   }
 }
 
-#if 0
+//static Rect islandnamer;
 
-static Rect islandnamer;
-
-void find_structure_islandname(CanonImage *im, RgbImage *ri) {
+void find_islandname(void) {
   Rect sunshiner;
+  char sunshine[MAXIMGIDENT];
+  const RgbImage *ri= page0_rgbimage;
 
+  cim= page_images[0];
+  
   sunshiner.tl.x= cim->w - 1034 +  885;
   sunshiner.br.x= cim->w - 1034 + 1020;
   sunshiner.tl.y= 227;
-  sunshiner.br.y= 227;
+  sunshiner.br.y= 228;
 
   ADJUST_BOX(sunshiner,"o*",30, 100,MUST, tl,y,-1);
-  ADJUST_BOX(sunshiner,"o*",30, 100,MUST, tl,y,-1);
+  ADJUST_BOX(sunshiner,"o*",30, 100,MUST, br,y,+1);
   debug_rect("sunshiner",0, sunshiner);
 
-  MUST(sunshiner.br.y - sunshiner.tl.y > 20);
-  sunshiner.tl.y++;
+  MUST(sunshiner.br.y - sunshiner.tl.y > 20, MR(sunshiner));
   sunshiner.br.y--;
 
   ADJUST_BOX(sunshiner,"o",20, (cim->w - 1034 + 700), MUST, tl,x,-1);
-  ADJUST_BOX(sunshiner,"o",20,  cim->w,               MUST, tl,x,+1);
+  ADJUST_BOX(sunshiner,"o",20,  cim->w,               MUST, br,x,+1);
   debug_rect("sunshiner",1, sunshiner);
 
-  lookup_rect();
+  identify_rgbimage(ri, sunshiner, sunshine);
+  fprintf(stderr,"sunshine: `%s'",sunshine);
   
+#if 0
+
 
   islandnamer.tl.x= cim->w - 1034 +  885;
   islandnamer.br.x= cim->w - 1034 + 1020;
@@ -536,6 +548,6 @@ void find_structure_islandname(CanonImage *im, RgbImage *ri) {
 
   
   abort();
-}
 
 #endif
+}