char c; /* canonical */
} CanonColourInfo;
-static int height, width;
-static char *image;
+static CanonImage *cim;
void debug_flush(void) {
eassert(!fflush(debug));
Point br;
} Rect;
-static inline char get(int x, int y) { return image[y * width + x]; }
+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); }
#define START_MAIN {200,200}
#define MIN_COLUMNS 6
#define INTERESTING_COLUMNS 6
+#define TEXT_COLUMNS 2
#define MAX_COLUMNS 7
static Rect mainr = { START_MAIN,START_MAIN };
{ 0x475A5E, '*' }, /* edge */
{ 0x2C5F7A, '*' }, /* edge just under box heading shadow */
{ 0x7D9094, '+' }, /* interbox */
- { 0xBDC5BF, ' ' }, /* background - pale */
- { 0xADB5AF, ' ' }, /* background - dark */
+
+ { 0xBDC5BF, ' ' }, /* background - pale Sugar cane, etc. */
+ { 0xADB5AF, ' ' }, /* background - dark */
+ { 0xC7E1C3, ' ' }, /* background - pale Swill, etc. */
+ { 0xB5CFB1, ' ' }, /* background - dark */
+ { 0xD6CEB0, ' ' }, /* background - pale Madder, etc. */
+ { 0xC8C0A2, ' ' }, /* background - dark */
+ { 0xE0E1D3, ' ' }, /* background - pale Lorandite, etc. */
+ { 0xD0D1C3, ' ' }, /* background - dark */
+ { 0xE5E6C1, ' ' }, /* background - pale Cloth */
+ { 0xD7D8B3, ' ' }, /* background - dark */
+ { 0xEDDED9, ' ' }, /* background - pale Dye */
+ { 0xDACBC6, ' ' }, /* background - dark */
+ { 0xD3DEDF, ' ' }, /* background - pale Paint */
+ { 0xC5D0D1, ' ' }, /* background - dark */
+ { 0xDCD1CF, ' ' }, /* background - pale Enamel */
+ { 0xCEC3C1, ' ' }, /* background - dark */
+ { 0xF3F6F5, ' ' }, /* background - pale fruit */
+ { 0xE2E7E5, ' ' }, /* background - dark */
+
{ 0x000000, 'o' }, /* foreground */
{ 0xD4B356, ' ' }, /* background (cursor) */
{ 0xFFFFFF, 'o' }, /* foreground (cursor) */
+
+ { 0x5B93BF, '_' }, /* selector dropdown background */
+ { 0xD7C94F, 'X' }, /* selector dropdown foreground */
{ 0,0 }
};
}
static void debug_rect(const char *what, int whati, Rect rr) {
+#ifdef DEBUG_RECTANGLES
int y,r,w;
fprintf(debug, "%s %d: %d,%d..%d,%d:\n", what, whati,
rr.tl.x,rr.tl.y, rr.br.x,rr.br.y);
w= rr.br.x - rr.tl.x + 1;
for (y=rr.tl.y; y<=rr.br.y; y++) {
fprintf(debug, "%4d%*s|", y, rr.tl.x,"");
- r= fwrite(image + y*width + rr.tl.x, 1, w, debug);
+ r= fwrite(cim->d + y*cim->w + rr.tl.x, 1, w, debug);
eassert(r==w);
fputc('|',debug);
fputc('\n',debug);
}
+#endif
debug_flush();
}
} while(0)
static void find_structure(void) {
- Rect whole = { {0,0}, {width-1,height-1} };
+ Rect whole = { {0,0}, {cim->w-1,cim->h-1} };
WALK_UNTIL_MUST(mainr.tl, x,-1, whole.tl.x, '*');
WALK_UNTIL_MUST(mainr.tl, y,-1, whole.tl.y, '*');
down.y++;
WALK_UNTIL_MUST(down, y,+1, mainr.br.y, '+');
+#ifdef DEBUG_RECTANGLES
int xscaleunit, y,x;
for (y=0, xscaleunit=1; y<4; y++, xscaleunit*=10) {
fprintf(debug," ");
- for (x=0; x<=width; x++) {
+ for (x=0; x<=cim->w; x++) {
if (x % xscaleunit) fputc(' ',debug);
else fprintf(debug,"%d",(x / xscaleunit)%10);
}
fputc('\n',debug);
}
+#endif
commbasey= up.y;
comminty= down.y - up.y + 2;
- fprintf(debug, "up.y=%d down.y=%d commbasey=%d comminty=%d\n",
- up.y,down.y, commbasey,comminty);
Point across= { mainr.tl.x, commbasey };
int colno=0;
eassert(colno < MAX_COLUMNS);
int colrx= across.x;
if (colrx > mainr.br.x) colrx= mainr.br.x;
- if (colno < INTERESTING_COLUMNS) {
+ if (colno < INTERESTING_COLUMNS)
colrightx[colno]= colrx;
- fprintf(debug,"colrightx[%d]= %d\n",colno,colrx);
- } else {
- fprintf(debug,"extra colr %d %d\n",colno,colrx);
- }
colno++;
require_rectangle_r(*cellr, " o");
}
-static void load_image_and_canonify(void) {
+CanonImage *file_read_image(FILE *f) {
struct pam inpam;
unsigned char rgb[3];
int x,y,r;
const CanonColourInfo *cci;
- pnm_readpaminit(stdin, &inpam, sizeof(inpam));
- height= inpam.height;
- width= inpam.width;
+ pnm_readpaminit(f, &inpam, sizeof(inpam));
eassert(inpam.maxval == 255);
eassert(inpam.bytes_per_sample == 1);
- image= malloc(width*height);
- eassert(image);
- memset(image,'?',width*height);
+ CanonImage *im= malloc(sizeof(CanonImage) + inpam.width*inpam.height);
+ eassert(im);
+ im->h= inpam.height;
+ im->w= inpam.width;
- for (y=0; y<height; y++) {
- for (x=0; x<width; x++) {
- r= fread(&rgb,1,3,stdin); eassert(r==3);
+ memset(im->d,'?',inpam.width*inpam.height);
+
+ for (y=0; y<inpam.height; y++) {
+ for (x=0; x<inpam.width; x++) {
+ r= fread(&rgb,1,3,f); eassert(r==3);
unsigned long rgb_l=
((unsigned long)rgb[0]<<16) |
((unsigned long)rgb[1]<<8) |
(rgb[2]);
for (cci=canoncolourinfos; cci->c; cci++)
if (cci->rgb == rgb_l) {
- image[y*width + x]= cci->c;
+ im->d[y*inpam.width + x]= cci->c;
break;
}
}
+#ifdef DEBUG_RECTANGLES
fprintf(debug, "%4d ",y);
- r= fwrite(image + y*width, 1,width, debug); eassert(r==width);
+ r= fwrite(im->d + y*inpam.width, 1,inpam.width, debug);
+ eassert(r==inpam.width);
fputc('\n',debug);
+#endif
}
debug_flush();
+ return im;
+}
+
+static void load_image_and_canonify(void) {
+ cim= file_read_image(stdin);
}
-static void ocr_rectangle(Rect r) {
+static void ocr_rectangle(Rect r, const OcrCellType ct) {
OcrResultGlyph *results, *res;
int w= r.br.x - r.tl.x + 1;
}
cols[w]= 0;
- results= ocr(rd,w,cols);
+ results= ocr(rd,ct,w,cols);
printf("YES! \"");
for (res=results; res->s; res++)
printf("%s",res->s);
eassert(!fflush(stdout));
}
-int main(void) {
+int main_test(void) {
Rect thisr, entryr;
int tryrect, colno;
find_structure();
rd= ocr_init(text_h);
- for (tryrect= +height; tryrect >= -height; tryrect--) {
+ for (tryrect= +cim->h; tryrect >= -cim->h; tryrect--) {
find_commodity(tryrect, &thisr);
if (thisr.tl.x < 0)
continue;
for (colno=0; colno<MIN_COLUMNS; colno++) {
find_table_entry(thisr,colno,&entryr);
- ocr_rectangle(entryr);
+ ocr_rectangle(entryr,
+ colno<TEXT_COLUMNS
+ ? &ocr_celltype_text
+ : &ocr_celltype_number);
}
}
return 0;
~yarrgweb / ypp-sc-tools.db-test.git / blobdiff