#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); }
"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"
#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)
#define REQUIRE_RECTANGLE(tlx,tly,brx,bry,ok) \
require_rectangle(tlx, tly, brx, bry, ok, __LINE__);
-#define FOR_P_RECT(p,rect) \
+#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++)
); \
}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).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) 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) {
cim= im;
Rect whole = { {0,0}, {cim->w-1,cim->h-1} };
SET_ONCE(text_h, comminty - 1);
if (max_relevant_y_r)
SET_ONCE(*max_relevant_y_r, mainr.br.y + 10);
+
+ 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);
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");
+ 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);
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= ri_rgb(ri, cell->br.x, cell->br.y);
+ long bg_count=0, light_count=0, dark_count=0;
+ Point p;
+ FOR_P_RECT(p,*cell) {
+ Rgb here= ri_rgb(ri, p.x, p.y);
+ if (here == background) bg_count++;
+ else if (here < background) dark_count++;
+ else if (here > background) light_count++;
+ }
+ long total_count= RECT_W(*cell) * RECT_H(*cell);
+ 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;
+
+ MUST( !!dark_count != !!light_count,
+ MR(*cell);MIL(total_count);MIL(bg_count);
+ MIL(light_count);MIL(dark_count) );
+
+ 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);
+
+ Rgb foreground;
+ double fg_extra;
+ if (light_count) {
+ foreground= 0xffffffU;
+ fg_extra= +1;
+ } else {
+ foreground= 0;
+ fg_extra= -1;
+ }
+ 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 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);
+ 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) {
Pixcol cols[w+1];
int x,y;
for (x=0; x<w; x++) {
- Pixcol cx, rv;
- for (y=0, cx=0, rv=1; y<text_h; y++, rv<<=1) {
+ FILLZERO(cols[x]);
+ for (y=0; y<text_h; y++) {
Point here= { x+r.tl.x, y+r.tl.y };
int pixel= get_p(here);
- switch (pixel) {
- case ' ': break;
- case 'o': cx |= rv; break;
- default:
- MUST(!"wrong pixel",
- MC(pixel);MP(here);MSB(ocr_celltype_name(ct));MR(r); );
- }
+ if (pixel==' ') pixel= '0';
+ MUST( pixel >= '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++)
sunshiner.tl.y= 227;
sunshiner.br.y= 228;
- ADJUST_BOX(sunshiner,"o*",30, 100,MUST, tl,y,-1);
- ADJUST_BOX(sunshiner,"o*",30, 100,MUST, br,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, 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;
}
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;
}
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;
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;
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();
+ case 'O': runs[nruns]++; pattern |= 1u; break;
+ default: pattern |= 1UL<<31; break;
}
}
nspaces++;
might_be_colon=0;
} else {
- if (nruns==2 && runs[1]==runs[0]) {
+ if (!(pattern & 1UL<<31) && nruns==2 && runs[1]==runs[0]) {
if (!nspaces) {
if (pattern==colon_pattern)
goto ok_might_be_colon;
islandnamer.br.x= p.x;
identify_rgbimage(ri, islandnamer, archisland, "island");
+ } else {
+
+ MUST(!"sunshine shows ship or ahoy", MS(sunshine) );
+
}
char *delim= strstr(archisland," - ");
archipelago= masprintf("%.*s", (int)(delim-archisland), archisland);
island= masprintf("%s", delim+3);
- free(ri);
}
~yarrgweb / ypp-sc-tools.db-test.git / blobdiff