mode_all= 0111,
} o_mode= mode_all;
-static char *o_screenshots_fn;
+static char *o_screenshot_fn;
static int o_single_page, o_quiet;
static const char *o_outputmode= "upload";
-FILE *screenshots_file;
+FILE *screenshot_file;
static void vbadusage(const char *fmt, va_list) FMT(1,0) NORET;
}
DEFINE_VWRAPPERF(static, badusage, NORET);
-static void open_screenshots_file(const char *mode) {
- screenshots_file= fopen(o_screenshots_fn, mode);
- if (!screenshots_file)
+static void open_screenshot_file(const char *mode) {
+ screenshot_file= fopen(o_screenshot_fn, mode);
+ if (!screenshot_file)
fatal("could not open screenshots file `%s': %s",
- o_screenshots_fn, strerror(errno));
+ o_screenshot_fn, strerror(errno));
}
static void run_analysis(void) {
!strcmp(arg,"--tsv") ||
!strcmp(arg,"--best-prices"))
o_outputmode= arg+2;
- else if (!strcmp(arg,"--screenshots-file"))
- o_screenshots_fn= ARGVAL;
+ else if (!strcmp(arg,"--screenshot-file"))
+ o_screenshot_fn= ARGVAL;
#define DF(f) \
else if (!strcmp(arg,"-D" #f)) \
debug_flags |= dbg_##f;
badusage("unknown option `%s'",arg);
}
- if (!o_screenshots_fn) {
- r= asprintf(&o_screenshots_fn,"%s/#pages#.ppm",get_vardir());
+ if (!o_screenshot_fn) {
+ r= asprintf(&o_screenshot_fn,"%s/#pages#.ppm",get_vardir());
sysassert(r>=0);
}
find_yppclient_window();
}
if (o_mode & mf_screenshot) {
- open_screenshots_file("w");
+ open_screenshot_file("w");
if (o_single_page) take_one_screenshot();
else take_screenshots();
}
if (o_mode & mf_readscreenshot) {
- open_screenshots_file("r");
+ open_screenshot_file("r");
if (o_single_page) read_one_screenshot();
else read_screenshots();
}
const CanonColourInfo canoncolourinfos[]= {
{ 0x475A5E, '*' }, /* edge */
{ 0x2C5F7A, '*' }, /* edge just under box heading shadow */
+ { 0xC5C7Ae, '*' }, /* blank area of partial commodities list */
{ 0x7D9094, '+' }, /* interbox */
{ 0xBDC5BF, ' ' }, /* background - pale Sugar cane, etc. */
#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__);
+
static void require_rectangle(int tlx, int tly, int brx, int bry,
- const char *ok) {
+ const char *ok, int lineno) {
Point p;
for (p.x=tlx; p.x<=brx; p.x++)
for (p.y=tly; p.y<=bry; p.y++) {
int c= get_p(p);
MUST( strchr(ok,c), ({
Rect rm={{tlx,tly},{brx,bry}};
- MR(rm);MP(p);MS(ok);
+ MI(lineno),MR(rm);MP(p);MS(ok);
}));
}
}
-static void require_rectangle_r(Rect rr, const char *ok) {
- require_rectangle(rr.tl.x,rr.tl.y, rr.br.x,rr.br.y, ok);
+static void require_rectangle_r(Rect rr, const char *ok, int lineno) {
+ require_rectangle(rr.tl.x,rr.tl.y, rr.br.x,rr.br.y, ok, lineno);
}
static void debug_rect(const char *what, int whati, Rect rr) {
WALK_UNTIL_MUST(mainr.br, x,+1, whole.br.x, '*');
WALK_UNTIL_MUST(mainr.br, y,+1, whole.br.y, '*');
- require_rectangle(mainr.tl.x-1, mainr.tl.y, mainr.tl.x-1, mainr.br.y, "*");
- require_rectangle(mainr.br.x+1, mainr.tl.y, mainr.br.x+1, mainr.br.y, "*");
- require_rectangle(mainr.tl.x, mainr.tl.y-1, mainr.br.x, mainr.tl.y-1, "*");
- require_rectangle(mainr.tl.x, mainr.br.y+1, mainr.br.x, mainr.br.y+1, "*");
-
-#define CHECK_STRIP_BORDER(tlbr,xy,increm) \
- do { \
- Point csb_p; \
- Rect csb_r; \
- csb_p= mainr.tl; \
- csb_p.xy= mainr.tlbr.xy; \
- if (get_p(csb_p)=='+') { \
- csb_r= mainr; \
- csb_r.tl.xy= csb_p.xy; \
- csb_r.br.xy= csb_p.xy; \
- require_rectangle_r(csb_r, "+"); \
- mainr.tlbr.xy += increm; \
- } \
+ REQUIRE_RECTANGLE(mainr.tl.x-1, mainr.tl.y, mainr.tl.x-1, mainr.br.y, "*");
+ REQUIRE_RECTANGLE(mainr.br.x+1, mainr.tl.y, mainr.br.x+1, mainr.br.y, "*");
+ REQUIRE_RECTANGLE(mainr.tl.x, mainr.tl.y-1, mainr.br.x, mainr.tl.y-1, "*");
+ REQUIRE_RECTANGLE(mainr.tl.x, mainr.br.y+1, mainr.br.x, mainr.br.y+1, "*");
+
+#define CHECK_STRIP_BORDER(tlbr,xy,increm) \
+ do { \
+ Point csb_p; \
+ Rect csb_r; \
+ csb_p= mainr.tl; \
+ csb_p.xy= mainr.tlbr.xy; \
+ if (get_p(csb_p)=='+') { \
+ csb_r= mainr; \
+ csb_r.tl.xy= csb_p.xy; \
+ csb_r.br.xy= csb_p.xy; \
+ require_rectangle_r(csb_r, "+", __LINE__); \
+ mainr.tlbr.xy += increm; \
+ } \
} while(0)
debug_rect("mainr",0, mainr);
break;
across.x++;
- require_rectangle(across.x,mainr.tl.y, across.x,mainr.br.y, "+");
+ REQUIRE_RECTANGLE(across.x,mainr.tl.y, across.x,mainr.br.y, "+");
across.x++;
}
MUST( colno >= MIN_COLUMNS, MI(colno);MR(mainr);MP(across); );
(rgb_buf[2]);
});
- sysassert(!ferror(screenshots_file));
+ sysassert(!ferror(screenshot_file));
if (!(npages < MAX_PAGES))
fatal("Too many images in screenshots file; max is %d.\n", MAX_PAGES);
void read_one_screenshot(void) {
progress("reading screenshot...");
- file_read_image_ppm(screenshots_file);
+ file_read_image_ppm(screenshot_file);
progress_log("read screenshot.");
}
void read_screenshots(void) {
struct stat stab;
- sysassert(! fstat(fileno(screenshots_file), &stab) );
+ sysassert(! fstat(fileno(screenshot_file), &stab) );
for (;;) {
if (S_ISREG(stab.st_mode)) {
- long pos= ftell(screenshots_file);
+ long pos= ftell(screenshot_file);
if (pos == stab.st_size) break;
} else {
- int c= fgetc(screenshots_file);
+ int c= fgetc(screenshot_file);
if (c==EOF) break;
- ungetc(c, screenshots_file);
+ ungetc(c, screenshot_file);
}
progress("reading screenshot %d...",npages);
- file_read_image_ppm(screenshots_file);
+ file_read_image_ppm(screenshot_file);
}
- sysassert(!ferror(screenshots_file));
+ sysassert(!ferror(screenshot_file));
progress_log("read %d screenshots.",npages);
}
rr->br.x= mainr.br.x;
if (rr->tl.y > mainr.tl.y)
- require_rectangle(rr->tl.x,rr->tl.y-1, rr->br.x,rr->tl.y-1, "+");
+ REQUIRE_RECTANGLE(rr->tl.x,rr->tl.y-1, rr->br.x,rr->tl.y-1, "+");
if (rr->br.y < mainr.tl.y)
- require_rectangle(rr->tl.x,rr->br.y+1, rr->br.x,rr->br.y+1, "+");
+ 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.x= !colno ? commod.tl.x : colrightx[colno-1]+2;
cellr->br.x= colrightx[colno];
debug_rect("cell", colno, *cellr);
- require_rectangle_r(*cellr, " o");
+ require_rectangle_r(*cellr, " o", __LINE__);
}
static void ocr_rectangle(Rect r, const OcrCellType ct, FILE *tsv_output) {