for (i=0, s=rd->results; i<rd->nresults; i++, s++) {
if (!strcmp(s->s," ")) continue;
fprintf(resolver," %d %d ",s->l,s->r);
- cu_pr_ctxmap(resolver,s->ctxmap);
+ cu_pr_ctxmap(resolver, 1u << s->ctxi);
fprintf(resolver," ");
for (p=s->s; (c= *p); p++) {
if (c=='\\') fprintf(resolver,"\\%c",c);
readdb(rd);
}
-static void add_result(OcrReader *rd, const char *s, int l, int r,
- unsigned ctxmap) {
+static void add_result(OcrReader *rd, const char *s, int l, int r, int ctxi) {
if (rd->nresults >= rd->aresults) {
rd->aresults++; rd->aresults<<=1;
rd->results= mrealloc(rd->results, sizeof(*rd->results)*rd->aresults);
rd->results[rd->nresults].s= s;
rd->results[rd->nresults].l= l;
rd->results[rd->nresults].r= r;
- rd->results[rd->nresults].ctxmap= ctxmap;
+ rd->results[rd->nresults].ctxi= ctxi;
rd->nresults++;
}
return bestmatch;
}
-static DatabaseNode *findchar(const FindCharArgs *fca, int *match_rx) {
+static DatabaseNode *findchar(const FindCharArgs *fca,
+ int *match_rx, int *match_rctxi) {
FindCharResults results[NCONTEXTS];
int ctxi, match=-1, nmatches=0;
if (match<0)
return 0;
- *match_rx= results[ctxi].rx;
- return results[ctxi].match;
+ *match_rx= results[match].rx;
+ if (match_rctxi) *match_rctxi= match;
+ return results[match].match;
}
static int findchar_select_text(const FindCharArgs *fca,
const struct OcrCellTypeInfo ocr_celltype_text= {
.initial= 012, /* Digit|Upper */
.nextword= 017, /* Digit|Upper|Lower|Word */
- .midword= 014, /* Digit|Lower */
+ .midword= 011, /* Digit|Lower */
.space_spaces= 4,
.name= "text",
.findchar_select= findchar_select_text
/* something here, so we need to add the spaces */
if (nspaces >= ct->space_spaces)
- add_result(rd," ",x-nspaces,x+1,0);
+ add_result(rd," ",x-nspaces,x+1,-1);
nspaces=0;
fca.x= x;
int match_rx=-1;
- DatabaseNode *match= findchar(&fca, &match_rx);
+ int match_ctxi=-1;
+ DatabaseNode *match= findchar(&fca, &match_rx, &match_ctxi);
if (match) {
debugf(" || YES");
- add_result(rd, match->str, x, match_rx, fca.ctxmap);
+ add_result(rd, match->str, x, match_rx, match_ctxi);
x= match_rx+1;
if (match->match) fca.ctxmap= ct->midword;
else debugf(" (empty)");
}
}
- add_result(rd, 0,-1,-1,0);
+ add_result(rd, 0,-1,-1,-1);
debugf("OCR finished %d glyphs\n",rd->nresults);
debug_flush();
return rd->results;