DatabaseLink *links;
} DatabaseNode;
+typedef struct {
+ OcrReader *rd;
+ OcrCellType ct;
+ int w;
+ Pixcol *cols;
+ int x;
+ unsigned ctxmap;
+} FindCharArgs;
+typedef struct {
+ DatabaseNode *match;
+ int rx;
+} FindCharResults;
+
+enum { ct_Lower, ct_Upper, ct_Word, ct_Digit };
static const char *context_names[]= {
- "Lower",
- "Upper",
- "Digit"
+ "Lower", /* bit 0, value 001 */
+ "Upper", /* bit 1, value 002 */
+ "Word", /* bit 2, value 004 */
+ "Digit", /* bit 3, value 010 */
};
struct OcrCellTypeInfo {
/* bitmaps of indices into context_names: */
unsigned initial, nextword, midword;
int space_spaces;
const char *name;
+ int (*findchar_select)(const FindCharArgs *fca,
+ const FindCharResults results[]);
};
-const struct OcrCellTypeInfo ocr_celltype_number= {
- 4,4,4,
- .space_spaces= 5,
- .name= "number"
-};
-const struct OcrCellTypeInfo ocr_celltype_text= {
- .initial=2, /* Uppercase */
- .nextword=3, /* Either */
- .midword=1, /* Lower only */
- .space_spaces= 4,
- .name= "text"
-};
-
#define NCONTEXTS (sizeof(context_names)/sizeof(context_names[0]))
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++;
}
+static DatabaseNode *findchar_1ctx(const FindCharArgs *fca,
+ DatabaseNode *start, int *matchx_r) {
+ DatabaseNode *current= start;
+ DatabaseNode *bestmatch= 0;
+ int i;
+ int x= fca->x;
+
+ for (;;) {
+ debug_flush();
+ debugf(" | x=%d",x);
+ if (x > fca->w) break;
+ Pixcol cv= fca->cols[x];
+ debugf(" cv=%"PSPIXCOL(PRIx),cv);
+ for (i=0; i<current->nlinks; i++)
+ if (current->links[i].col == cv)
+ goto found;
+ /* not found */
+ debugf(" ?");
+ break;
+
+ found:
+ current= current->links[i].then;
+ if (current->match) {
+ debugf(" \"%s\"%s",current->str,current->endsword?"_":"");
+ bestmatch= current;
+ *matchx_r= x;
+ } else {
+ debugf(" ...");
+ }
+
+ x++;
+ }
+ return bestmatch;
+}
+
+static DatabaseNode *findchar(const FindCharArgs *fca,
+ int *match_rx, int *match_rctxi) {
+ FindCharResults results[NCONTEXTS];
+ int ctxi, match=-1, nmatches=0;
+
+ debugf("OCR lx=%d ct_state=%x ", fca->x, fca->ctxmap);
+ for (ctxi=0; ctxi<NCONTEXTS; ctxi++) {
+ results[ctxi].match= 0;
+ if (!(fca->ctxmap & (1u << ctxi))) continue;
+ debugf(" || %s",context_names[ctxi]);
+
+ results[ctxi].match= findchar_1ctx(fca, &fca->rd->contexts[ctxi],
+ &results[ctxi].rx);
+ if (!results[ctxi].match) continue;
+
+ match= ctxi;
+ nmatches++;
+ }
+ if (nmatches==1) {
+ debugf(" unique");
+ } else {
+ debugf(" ambiguous");
+ match= !fca->ct->findchar_select ? -1 :
+ fca->ct->findchar_select(fca,results);
+ debugf(" resolved %s", match<0 ? "<none>" : context_names[match]);
+ }
+ if (match<0)
+ return 0;
+
+ *match_rx= results[match].rx;
+ if (match_rctxi) *match_rctxi= match;
+ return results[match].match;
+}
+
+static int findchar_select_text(const FindCharArgs *fca,
+ const FindCharResults results[]) {
+ if (fca->ctxmap != 017) return -1;
+
+ dbassert(! results[ct_Digit].match );
+ if (results[ct_Word].match) return ct_Word;
+ if (results[ct_Lower].rx > results[ct_Upper].rx) return ct_Lower;
+ if (results[ct_Upper].rx > results[ct_Lower].rx) return ct_Upper;
+ return -1;
+}
+
+const struct OcrCellTypeInfo ocr_celltype_number= {
+ 010,010,010,
+ .space_spaces= 5,
+ .name= "number",
+ .findchar_select= 0
+};
+const struct OcrCellTypeInfo ocr_celltype_text= {
+ .initial= 012, /* Digit|Upper */
+ .nextword= 017, /* Digit|Upper|Lower|Word */
+ .midword= 011, /* Digit|Lower */
+ .space_spaces= 4,
+ .name= "text",
+ .findchar_select= findchar_select_text
+};
+
+
const char *ocr_celltype_name(OcrCellType ct) { return ct->name; }
OcrResultGlyph *ocr(OcrReader *rd, OcrCellType ct, int w, Pixcol cols[]) {
int nspaces;
- unsigned ctxmap;
- int ctxi, i, x;
+ int x;
+
+ FindCharArgs fca;
+ fca.rd= rd;
+ fca.ct= ct;
+ fca.w= w;
+ fca.cols= cols;
+ fca.x= -1;
restart:
nspaces=- w;
- ctxmap= ct->initial;
+ fca.ctxmap= ct->initial;
rd->nresults=0;
debugf("OCR h=%d w=%d",rd->h,w);
for (x=0; x<w; x++) debugf(" %"PSPIXCOL(PRIx),cols[x]);
x++;
if (nspaces == ct->space_spaces) {
debugf("OCR x=%x nspaces=%d space\n",x,nspaces);
- ctxmap= ct->nextword;
+ fca.ctxmap= ct->nextword;
}
continue;
}
/* 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;
- /* find character */
- int lx=x;
+ fca.x= x;
- DatabaseNode *uniquematch= 0;
- int uniquematch_rx=-1;
+ int match_rx=-1;
+ int match_ctxi=-1;
+ DatabaseNode *match= findchar(&fca, &match_rx, &match_ctxi);
- debugf("OCR lx=%d ctxmap=%x ",lx,ctxmap);
-
- for (ctxi=0; ctxi<NCONTEXTS; ctxi++) {
- DatabaseNode *current= &rd->contexts[ctxi];;
- DatabaseNode *bestmatch= 0;
- int bestmatch_rx=-1;
-
- x= lx;
- if (!(ctxmap & (1u << ctxi))) continue;
- debugf(" || %s",context_names[ctxi]);
-
- for (;;) {
- debug_flush();
- debugf(" | x=%d",x);
- if (x>w) break;
- Pixcol cv= cols[x];
- debugf(" cv=%"PSPIXCOL(PRIx),cv);
- for (i=0; i<current->nlinks; i++)
- if (current->links[i].col == cv)
- goto found;
- /* not found */
- debugf(" ?");
- break;
-
- found:
- current= current->links[i].then;
- if (current->match) {
- debugf(" \"%s\"%s",current->str,current->endsword?"_":"");
- bestmatch= current;
- bestmatch_rx= x;
- } else {
- debugf(" ...");
- }
-
- x++;
- }
-
- if (bestmatch) {
- if (uniquematch && strcmp(bestmatch->str, uniquematch->str)) {
- debugf( " ambiguous");
- uniquematch= 0;
- break;
- }
- uniquematch= bestmatch;
- uniquematch_rx= bestmatch_rx;
- }
- }
-
- if (uniquematch) {
+ if (match) {
debugf(" || YES");
- add_result(rd, uniquematch->str, lx, uniquematch_rx, ctxmap);
- x= uniquematch_rx+1;
- if (uniquematch->match) ctxmap= ct->midword;
+ add_result(rd, match->str, x, match_rx, match_ctxi);
+ x= match_rx+1;
+ if (match->match) fca.ctxmap= ct->midword;
else debugf(" (empty)");
- if (uniquematch->endsword) {
+ if (match->endsword) {
nspaces= ct->space_spaces;
debugf("_");
- ctxmap= ct->nextword;
+ fca.ctxmap= ct->nextword;
}
debugf("\n");
} else {
int rx;
debugf(" || UNKNOWN");
- for (rx=lx; rx<w && cols[rx]; rx++);
- debugf(" x=%d ctxmap=%x %d..%d\n",x, ctxmap, lx,rx);
+ for (rx=x; rx<w && cols[rx]; rx++);
+ debugf(" x=%d ctxmap=%x %d..%d\n",x, fca.ctxmap, x,rx);
debug_flush();
- callout_unknown(rd, w,cols, lx,rx-1, ctxmap);
+ callout_unknown(rd, w,cols, x,rx-1, fca.ctxmap);
goto restart;
}
+
}
- 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;
OcrReader *rd;
if (o_flags & ff_dict_fetch) {
- char *fetchfile= masprintf("master-char%d",rd->h);
- progress("Updating %s",fetchfile);
+ char *fetchfile= masprintf("char%d",h);
+ progress("Updating %s...",fetchfile);
fetch_with_rsync(fetchfile);
free(fetchfile);
}
~yarrgweb / ypp-sc-tools.main.git / blobdiff