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=ad95cb508791b5213e64bd8170258b302ff0d7cb;hp=fba7670a3b510e105dff978f1d21350928c0963f;hb=e2487a42fd29e7a15b92ce1a5855706dba1198dc;hpb=8d6cf0f224b5df9866eba9350343067edcee78dd diff --git a/pctb/structure.c b/pctb/structure.c index fba7670..ad95cb5 100644 --- a/pctb/structure.c +++ b/pctb/structure.c @@ -27,7 +27,7 @@ #include "structure.h" -static const CanonImage *cim; +static 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); } @@ -40,7 +40,7 @@ DEBUG_DEFINE_DEBUGF(struct) #define TEXT_COLUMNS 2 #define MAX_COLUMNS 7 -static Rect mainr = { START_MAIN,START_MAIN }; +static Rect mainr; static int commbasey, comminty; static int colrightx[INTERESTING_COLUMNS]; static int text_h=-1, columns=-1; @@ -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, @@ -96,10 +126,8 @@ static void mustfail1(const char *file, int line, const char *what) { "Unable to figure out contents of YPP client display.\n" "Please check the following:\n" " * YPP client is showing commodity listing screen\n" - " * YPP client has antialiased text turned off (Ye / Options / General)\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:" @@ -123,8 +151,11 @@ static void mustfail2(void) { #define MP(v) fprintf(stderr," %s=%d,%d",#v,(v).x,(v).y) #define MI(v) fprintf(stderr," %s=%d", #v,(v)) +#define MIL(v) fprintf(stderr," %s=%ld", #v,(v)) +#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 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) @@ -133,20 +164,23 @@ static void mustfail2(void) { #define REQUIRE_RECTANGLE(tlx,tly,brx,bry,ok) \ require_rectangle(tlx, tly, brx, bry, ok, __LINE__); -static void require_rectangle(int tlx, int tly, int brx, int bry, - const char *ok, int lineno) { +#define FOR_P_RECT(p,rr) \ + for ((p).x=(rr).tl.x; (p).x<=(rr).br.x; (p).x++) \ + for ((p).y=(rr).tl.y; (p).y<=(rr).br.y; (p).y++) + +static void require_rectangle_r(Rect rr, const char *ok, int lineno) { Point p; - for (p.x=tlx; p.x<=brx; p.x++) - for (p.y=tly; p.y<=bry; p.y++) { - int c= get_p(p); - MUST( strchr(ok,c), ({ - Rect rm={{tlx,tly},{brx,bry}}; - MI(lineno),MR(rm);MP(p);MS(ok); - })); - } + FOR_P_RECT(p,rr) { + int c= get_p(p); + MUST( strchr(ok,c), ({ + MI(lineno),MR(rr);MP(p);MS(ok); + })); + } } -static void require_rectangle_r(Rect rr, const char *ok, int lineno) { - require_rectangle(rr.tl.x,rr.tl.y, rr.br.x,rr.br.y, ok, lineno); +static void require_rectangle(int tlx, int tly, int brx, int bry, + const char *ok, int lineno) { + Rect rr= {{tlx,tly},{brx,bry}}; + require_rectangle_r(rr, ok, lineno); } static void debug_rect(const char *what, int whati, Rect rr) { @@ -205,23 +239,26 @@ static int commod_selector_matches(Rect search, const char *const *all, ); \ }while(0) -#define ADJUST_BOX(search,insidechrs,want, lim,LIMIT_MUST, TLBR,XY,increm) \ - for (;;) { \ - LIMIT_MUST( (search).tl.XY != (search).br.XY && \ - (search).tl.XY != (lim), \ - MR((search));MSB(#TLBR);MSB(#XY) ); \ - 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)); \ - if (got >= (want)) \ - break; \ - (search).TLBR.XY += increm; \ +#define ADJUST_BOX(search,insidechrs,OP,want, lim,LIMIT_MUST, TLBR,XY,increm) \ + for (;;) { \ + LIMIT_MUST( (search).tl.XY != (search).br.XY && \ + (search).TLBR.XY != (lim), \ + MR((search));MSB(#TLBR);MSB(#XY) ); \ + 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)); \ + if ((got) OP (want)) \ + break; \ + (search).TLBR.XY += increm; \ } -void find_structure(const CanonImage *im, int *max_relevant_y_r) { +void find_structure(CanonImage *im, int *max_relevant_y_r, + Point *commod_focus_point_r, + Point *commod_page_point_r, + Point *commod_focuslast_point_r) { cim= im; Rect whole = { {0,0}, {cim->w-1,cim->h-1} }; @@ -238,6 +275,11 @@ void find_structure(const CanonImage *im, int *max_relevant_y_r) { } } + Point mainr_tl= START_MAIN; + mainr.tl= mainr_tl; + WALK_UNTIL_MUST(mainr.tl, y,-1, whole.tl.y, ' '); + mainr.br= mainr.tl; + WALK_UNTIL_MUST(mainr.tl, x,-1, whole.tl.x, '*'); WALK_UNTIL_MUST(mainr.tl, y,-1, whole.tl.y, '*'); WALK_UNTIL_MUST(mainr.br, x,+1, whole.br.x, '*'); @@ -253,6 +295,7 @@ void find_structure(const CanonImage *im, int *max_relevant_y_r) { Point csb_p; \ Rect csb_r; \ csb_p= mainr.tl; \ + csb_p.x++; csb_p.y++; \ csb_p.xy= mainr.tlbr.xy; \ if (get_p(csb_p)=='+') { \ csb_r= mainr; \ @@ -272,37 +315,65 @@ void find_structure(const CanonImage *im, int *max_relevant_y_r) { debug_rect("mainr",1, mainr); - Point up = START_MAIN; - WALK_UNTIL_MUST(up, y,-1, mainr.tl.y, '+'); + Rect updown= {START_MAIN,START_MAIN}; + const int chkw= 100; + updown.br.x += chkw-1; + updown.br.y++; + debug_rect("updown",__LINE__,updown); + + ADJUST_BOX(updown, "+", >=,chkw, mainr.tl.y, MUST, tl,y,-1); + debug_rect("updown",__LINE__,updown); + updown.br.y= updown.tl.y; + updown.tl.y= updown.tl.y-1; - Point down = START_MAIN; - down.y++; - WALK_UNTIL_MUST(down, y,+1, mainr.br.y, '+'); + ADJUST_BOX(updown, "+*",>=,chkw, mainr.tl.y-1, MUST, tl,y,-1); + debug_rect("updown",__LINE__,updown); - commbasey= up.y; - comminty= down.y - up.y + 2; + commbasey= updown.tl.y + 1; + comminty= updown.br.y - updown.tl.y; - Point across= { mainr.tl.x, commbasey }; + Rect across= {{ mainr.tl.x - 1, commbasey }, + { mainr.tl.x, commbasey + comminty-2 }}; int colno=0; for (;;) { - MUST( get_p(across) != '+', MI(colno);MP(across);MR(mainr);MI(commbasey) ); - WALK_UNTIL(across, x,+1, mainr.br.x, '+'); - MUST( colno < MAX_COLUMNS, MP(across);MR(mainr);MI(commbasey); ); - int colrx= across.x; - if (colrx > mainr.br.x) colrx= mainr.br.x; + +#define LIMIT_QUITEQ(cond,mp) { if (!(cond)) break; } + debug_rect("across",colno*1000000+__LINE__, across); + ADJUST_BOX(across, "+",>=,comminty-1, mainr.br.x, LIMIT_QUITEQ, br,x,+1); + debug_rect("across",colno*1000000+__LINE__, across); + + MUST( colno < MAX_COLUMNS, MI(colno);MR(across);MR(mainr);MI(commbasey); ); + int colrx= across.br.x-1; + if (colrx >= mainr.br.x) colrx= mainr.br.x; if (colno < INTERESTING_COLUMNS) colrightx[colno]= colrx; colno++; - if (across.x >= mainr.br.x-1) + if (across.br.x >= mainr.br.x) break; - across.x++; - REQUIRE_RECTANGLE(across.x,mainr.tl.y, across.x,mainr.br.y, "+"); - across.x++; + REQUIRE_RECTANGLE(across.br.x,mainr.tl.y, across.br.x,mainr.br.y, "+"); + across.br.x++; } - MUST( colno >= MIN_COLUMNS, MI(colno);MR(mainr);MP(across); ); + MUST( colno >= MIN_COLUMNS, MI(colno);MR(mainr);MR(across); ); + + const int pagerh= 6; + Rect pager= {{ mainr.br.x, mainr.br.y - (pagerh-1) }, + { mainr.br.x + 1, mainr.br.y }}; + + debug_rect("pager",__LINE__,pager); + ADJUST_BOX(pager, "o",>=,pagerh-2, whole.br.x,MUST, br,x,+1); + debug_rect("pager",__LINE__,pager); + + pager.tl.x= pager.br.x; + pager.br.x= pager.br.x + 1; + debug_rect("pager",__LINE__,pager); + ADJUST_BOX(pager, "o",>=,pagerh-2, whole.br.x,MUST, br,x,+1); + debug_rect("pager",__LINE__,pager); + + ADJUST_BOX(pager, "o",>=,RECT_W(pager)-2, mainr.tl.y,LIMIT_QUITEQ, tl,y,-1); + debug_rect("pager",__LINE__,pager); #define SET_ONCE(var,val) do{ \ int v= (val); \ @@ -314,13 +385,30 @@ void find_structure(const CanonImage *im, int *max_relevant_y_r) { SET_ONCE(text_h, comminty - 1); if (max_relevant_y_r) SET_ONCE(*max_relevant_y_r, mainr.br.y + 10); + + if (commod_focus_point_r) { + *commod_focus_point_r= mainr.tl; + commod_focus_point_r->x += 10; + commod_focus_point_r->y += comminty/3; + } + if (commod_focuslast_point_r) { + *commod_focuslast_point_r= mainr.br; + commod_focuslast_point_r->x -= 10; + commod_focuslast_point_r->y -= comminty/3; + } + if (commod_page_point_r) { + commod_page_point_r->x= (pager.tl.x + pager.br.x) / 2; + commod_page_point_r->y= pager.tl.y - 1; + } + + MUST( text_h <= OCR_MAX_H, MI(text_h) ); } void check_correct_commodities(void) { Rect search= { { 50,39 }, { 130,59 } }; - ADJUST_BOX(search,"_",10, cim->h, MUST, tl,y,+1); - ADJUST_BOX(search,"_",10, 0, MUST, br,y,-1); + ADJUST_BOX(search,"_",>=,10, cim->h, MUST, tl,y,+1); + ADJUST_BOX(search,"_",>=,10, 0, MUST, br,y,-1); debug_rect("commodselr",1, search); @@ -375,29 +463,21 @@ 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 && inpam.bytes_per_sample == 1 && 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); + 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"); + if (rr!=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 (ri) - CANONIMG_ALSO_STORERGB(ri); + r= rgb_buf[0]; + g= rgb_buf[1]; + b= rgb_buf[2]; }); sysassert(!ferror(screenshot_file)); @@ -435,6 +515,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; @@ -450,13 +568,75 @@ static void find_commodity(int offset, Rect *rr) { REQUIRE_RECTANGLE(rr->tl.x,rr->br.y+1, rr->br.x,rr->br.y+1, "+"); } -static void find_table_entry(Rect commod, int colno, Rect *cellr) { - cellr->tl.y= commod.tl.y; - cellr->br.y= commod.br.y; - cellr->tl.x= !colno ? commod.tl.x : colrightx[colno-1]+2; - cellr->br.x= colrightx[colno]; - debug_rect("cell", colno, *cellr); - require_rectangle_r(*cellr, " o", __LINE__); +static void find_table_entry(Rect commod, int colno, Rect *cell) { + cell->tl.y= commod.tl.y; + cell->br.y= commod.br.y; + cell->tl.x= !colno ? commod.tl.x : colrightx[colno-1]+2; + cell->br.x= colrightx[colno]; + debug_rect("cell", colno, *cell); + + const RgbImage *ri= cim->rgb; + + Rgb background; + unsigned char chanbg[3]; + long bg_count=0, light_count=0, dark_count=0; + Point p; + + background= ri_rgb(ri, cell->br.x, cell->br.y); + memcpy(chanbg, RI_PIXEL(ri, cell->br.x, cell->br.y), 3); + + FOR_P_RECT(p,*cell) { + const unsigned char *here_pixel= RI_PIXEL(ri, p.x, p.y); + int i; + for (i=0; i<3; i++) { + unsigned here= here_pixel[i]; + if (here == chanbg[i]) bg_count++; + else if (here < chanbg[i]) dark_count += (chanbg[i] - here)/4 + 1; + else if (here > chanbg[i]) light_count += (here - chanbg[i])/4 + 1; + } + } + long total_count= RECT_W(*cell) * RECT_H(*cell) * 3; + + MUST( bg_count > total_count / 2, + MR(*cell);MIL(total_count);MIL(bg_count); + MIL(light_count);MIL(dark_count) ); + + if (bg_count == total_count) + return; + + Rgb foreground; + double fg_extra; + + if (light_count/16 > dark_count) { + foreground= 0xffffffU; + fg_extra= +1; + } else if (dark_count/16 > light_count) { + foreground= 0; + fg_extra= -1; + } else { + MUST( !"tell light from dark", + MR(*cell);MIL(total_count);MIL(bg_count); + MIL(light_count);MIL(dark_count);MRGB(background); ); + } + + debugf("TABLEENTRY col=%d %d,%d..%d,%d bg=%ld light=%ld dark=%ld\n", + colno, cell->tl.x,cell->tl.y, cell->br.x,cell->br.y, + bg_count, light_count, dark_count); + + int monochrome= 1; + + FOR_P_RECT(p,*cell) { + double alpha= find_aa_density(ri,p,background,foreground,fg_extra); + + 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; + } + + debug_rect("cell0M", colno, *cell); + + require_rectangle_r(*cell, "0123456789", __LINE__); } static void ocr_rectangle(Rect r, const OcrCellType ct, FILE *tsv_output) { @@ -466,21 +646,17 @@ static void ocr_rectangle(Rect r, const OcrCellType ct, FILE *tsv_output) { Pixcol cols[w+1]; int x,y; for (x=0; x= '0' && pixel <= '0'+AAMAXVAL, + MC(pixel);MP(here);MSB(ocr_celltype_name(ct));MR(r); ); + pixcol_p_add(&cols[x], y, pixel-'0'); } - cols[x]= cx; } - cols[w]= 0; + FILLZERO(cols[w]); results= ocr(rd,ct,w,cols); for (res=results; res->s; res++) @@ -492,7 +668,7 @@ void analyse(FILE *tsv_output) { int page, tryrect, colno; for (page=0; page=,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, 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, br,x,+1); + ADJUST_BOX(sunshiner,"o",>=,20, (cim->w - 1034 + 700), MUST, tl,x,-1); + ADJUST_BOX(sunshiner,"o",>=,20, cim->w, MUST, br,x,+1); debug_rect("sunshiner",1, sunshiner); return sunshiner; } -void find_islandname(RgbImage *ri) { - find_structure(page_images[0], 0); +void find_islandname(void) { + find_structure(page_images[0], 0,0,0,0); + RgbImage *ri= alloc_rgb_image(page_images[0]->rgb->w, + page_images[0]->rgb->h); + memcpy(ri->data, page_images[0]->rgb->data, ri->w * ri->h * 3); + Rect sunshiner= find_sunshine_widget(); char sunshine[MAXIMGIDENT], archisland[MAXIMGIDENT]; const unsigned char *srcp; unsigned char *destp, *endp; - for (srcp=page0_rgbimage->data, destp=ri->data, + for (srcp=page_images[0]->rgb->data, destp=ri->data, endp= ri->data + 3 * ri->w * ri->h; destp < endp; srcp++, destp++) { @@ -578,11 +758,11 @@ void find_islandname(RgbImage *ri) { islandnamer.tl.y= 128; islandnamer.br.y= 156; - ADJUST_BOX(islandnamer,"o",5, 0, MUST, tl,y,+1); - ADJUST_BOX(islandnamer,"o",5, cim->h, MUST, br,y,-1); + ADJUST_BOX(islandnamer,"o",>=,5, 0, MUST, tl,y,+1); + ADJUST_BOX(islandnamer,"o",>=,5, cim->h, MUST, br,y,-1); - ADJUST_BOX(islandnamer,"o",1, 0, MUST, tl,x,+1); - ADJUST_BOX(islandnamer,"o",1, cim->w, MUST, br,x,-1); + ADJUST_BOX(islandnamer,"o",>=,1, 0, MUST, tl,x,+1); + ADJUST_BOX(islandnamer,"o",>=,1, cim->w, MUST, br,x,-1); debug_rect("islandnamer",0, islandnamer); // int larger_islandnamebry= islandnamer.tl.y + 25; @@ -602,7 +782,7 @@ void find_islandname(RgbImage *ri) { } identify_rgbimage(ri, islandnamer, archisland, "island"); - } else { + } else if (!strcmp(sunshine,"Land - Ahoy!")) { Rect islandnamer; islandnamer.tl.x= (sunshiner.tl.x + sunshiner.br.x) / 2; @@ -615,23 +795,28 @@ void find_islandname(RgbImage *ri) { WALK_UNTIL_MUST(islandnamer.br,x, +1, cim->w, 'o'); debug_rect("islandnamer",__LINE__, islandnamer); - require_rectangle_r(islandnamer, "O*", __LINE__); +#define RW (RECT_W(islandnamer)) +#define RH (RECT_H(islandnamer)) - int rw= RECT_W(islandnamer); - ADJUST_BOX(islandnamer,"O",rw-4, cim->h, MUST,br,y,+1); + ADJUST_BOX(islandnamer,"O",>=,RW-4, cim->h, MUST,br,y,+1); debug_rect("islandnamer",__LINE__, islandnamer); islandnamer.br.y += 2; - ADJUST_BOX(islandnamer,"O",1, cim->h, MUST,br,y,+1); + + ADJUST_BOX(islandnamer,"*",<,RW, cim->h, MUST,br,y,+1); debug_rect("islandnamer",__LINE__, islandnamer); islandnamer.tl.y= islandnamer.br.y-1; islandnamer.br.y= islandnamer.br.y+1; - ADJUST_BOX(islandnamer,"*",rw, cim->h, MUST,br,y,+1); - ADJUST_BOX(islandnamer,"O",1, cim->w, MUST,tl,x,+1); debug_rect("islandnamer",__LINE__, islandnamer); - MUST( RECT_H(islandnamer) <= 31, MR(islandnamer)); + ADJUST_BOX(islandnamer,"*",>=,RW, cim->h, MUST,br,y,+1); + debug_rect("islandnamer",__LINE__, islandnamer); + + ADJUST_BOX(islandnamer,"*",<, RH, cim->w, MUST,tl,x,+1); + debug_rect("islandnamer",__LINE__, islandnamer); + + MUST( RECT_H(islandnamer) <= 30, MR(islandnamer)); Point p; int nspaces=1, might_be_colon=0; @@ -648,10 +833,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 'O': runs[nruns]++; pattern |= 1u; break; - case '*': if (runs[nruns]) { nruns++; runs[nruns]=0; } break; - default: abort(); + 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; + } } } @@ -674,6 +864,8 @@ void find_islandname(RgbImage *ri) { might_be_colon=1; goto ok_might_be_colon; } + } else if (nruns==1 && runs[0]==1 && might_be_colon) { + goto colon_found; } might_be_colon=0; ok_might_be_colon: @@ -688,12 +880,15 @@ void find_islandname(RgbImage *ri) { islandnamer.br.x= p.x; identify_rgbimage(ri, islandnamer, archisland, "island"); + } else { + + MUST(!"sunshine shows ship or ahoy", MS(sunshine) ); + } char *delim= strstr(archisland," - "); assert(delim); - archipelago= masprintf("%.*s", delim-archisland, archisland); + archipelago= masprintf("%.*s", (int)(delim-archisland), archisland); island= masprintf("%s", delim+3); - free(ri); }