chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wip new ctxmap passing
[ypp-sc-tools.db-test.git]
/
pctb
/
ocr.c
diff --git
a/pctb/ocr.c
b/pctb/ocr.c
index 1a8ac9a771e0104206ab6ff0454f3f813d6c373b..27271c766495406dedce819b8dfc2feea431cacd 100644
(file)
--- a/
pctb/ocr.c
+++ b/
pctb/ocr.c
@@
-244,7
+244,9
@@
static void callout_unknown(OcrReader *rd, int w, Pixcol cols[],
for (i=0, s=rd->results; i<rd->nresults; i++, s++) {
if (!strcmp(s->s," ")) continue;
fprintf(resolver," %d %d ",s->l,s->r);
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, 1u << s->ctxi);
+ cu_pr_ctxmap(resolver, 1u << s->match);
+ fprintf(resolver," ");
+ cu_pr_ctxmap(resolver, 1u << s->ctxmap);
fprintf(resolver," ");
for (p=s->s; (c= *p); p++) {
if (c=='\\') fprintf(resolver,"\\%c",c);
fprintf(resolver," ");
for (p=s->s; (c= *p); p++) {
if (c=='\\') fprintf(resolver,"\\%c",c);
@@
-274,7
+276,8
@@
static void callout_unknown(OcrReader *rd, int w, Pixcol cols[],
readdb(rd);
}
readdb(rd);
}
-static void add_result(OcrReader *rd, const char *s, int l, int r, int ctxi) {
+static void add_result(OcrReader *rd, const char *s, int l, int r,
+ int match, unsigned ctxmap) {
if (rd->nresults >= rd->aresults) {
rd->aresults++; rd->aresults<<=1;
rd->results= mrealloc(rd->results, sizeof(*rd->results)*rd->aresults);
if (rd->nresults >= rd->aresults) {
rd->aresults++; rd->aresults<<=1;
rd->results= mrealloc(rd->results, sizeof(*rd->results)*rd->aresults);
@@
-282,7
+285,8
@@
static void add_result(OcrReader *rd, const char *s, int l, int r, int ctxi) {
rd->results[rd->nresults].s= s;
rd->results[rd->nresults].l= l;
rd->results[rd->nresults].r= r;
rd->results[rd->nresults].s= s;
rd->results[rd->nresults].l= l;
rd->results[rd->nresults].r= r;
- rd->results[rd->nresults].ctxi= ctxi;
+ rd->results[rd->nresults].match= match;
+ rd->results[rd->nresults].ctxmap= ctxmap;
rd->nresults++;
}
rd->nresults++;
}
@@
-425,7
+429,7
@@
OcrResultGlyph *ocr(OcrReader *rd, OcrCellType ct, int w, Pixcol cols[]) {
/* something here, so we need to add the spaces */
if (nspaces >= ct->space_spaces)
/* something here, so we need to add the spaces */
if (nspaces >= ct->space_spaces)
- add_result(rd," ",x-nspaces,x+1,-1);
+ add_result(rd," ",x-nspaces,x+1,-1
,0
);
nspaces=0;
fca.x= x;
nspaces=0;
fca.x= x;
@@
-436,7
+440,7
@@
OcrResultGlyph *ocr(OcrReader *rd, OcrCellType ct, int w, Pixcol cols[]) {
if (match) {
debugf(" || YES");
if (match) {
debugf(" || YES");
- add_result(rd, match->str, x, match_rx, match_ctxi);
+ add_result(rd, match->str, x, match_rx, match_ctxi
, fca.ctxmap
);
x= match_rx+1;
if (match->match) fca.ctxmap= ct->midword;
else debugf(" (empty)");
x= match_rx+1;
if (match->match) fca.ctxmap= ct->midword;
else debugf(" (empty)");
@@
-457,7
+461,7
@@
OcrResultGlyph *ocr(OcrReader *rd, OcrCellType ct, int w, Pixcol cols[]) {
}
}
}
}
- add_result(rd, 0,-1,-1,-1);
+ add_result(rd, 0,-1,-1,-1
,0
);
debugf("OCR finished %d glyphs\n",rd->nresults);
debug_flush();
return rd->results;
debugf("OCR finished %d glyphs\n",rd->nresults);
debug_flush();
return rd->results;