X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2Fstructure.c;h=46b6853339580cb6df798fc3b28c835b95b7c59b;hp=a49fe0fd7e91782d6d1f68254ac6974e74097e87;hb=6a4d494e0e31f95bdd6dd54b814e8b2381ad95b2;hpb=991427d6209887f957d818367cf7643352093f1f diff --git a/yarrg/structure.c b/yarrg/structure.c index a49fe0f..46b6853 100644 --- a/yarrg/structure.c +++ b/yarrg/structure.c @@ -444,11 +444,16 @@ void find_structure(const CanonImage *im, } void check_correct_commodities(void) { - Rect search= { { 50,39 }, { 130,59 } }; + Rect search; + search.tl= s.mr.tl; search.tl.x += 34; search.tl.y -= 44; + search.br= s.mr.tl; search.br.x += 114; search.br.y -= 23; + MUST(search.br.x < cim->w-1 && search.tl.y > 0, + MR(search);MI(cim->w);MI(cim->h)); + + debug_rect("commodselr",0, search); ADJUST_BOX(search,"_",>=,10, cim->h, MUST, tl,y,+1); ADJUST_BOX(search,"_",>=,10, 0, MUST, br,y,-1); - debug_rect("commodselr",1, search); static const char *all_small[]= {