Merge branch 'refs/remote/t.fa.mason'

[ypp-sc-tools.main.git] / yarrg / structure.c

diff --git a/yarrg/structure.c b/yarrg/structure.c
index ba7ba0dedc5b9208fa1ec195bde7490e9f19d08a..46b6853339580cb6df798fc3b28c835b95b7c59b 100644 (file)
--- a/yarrg/structure.c
+++ b/yarrg/structure.c
@@ -444,11 +444,16 @@ void find_structure(const CanonImage *im,
 }                  
 
 void check_correct_commodities(void) {
 }                  
 
 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);
   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[]= {
   debug_rect("commodselr",1, search);
 
   static const char *all_small[]= {


@@ -1052,7 +1057,7 @@ void check_pager_motion(int first, int stop) {
   if (count <= 1) return; /* only one page */
 
   double firstheight= PH(first);
   if (count <= 1) return; /* only one page */
 
   double firstheight= PH(first);

-  double max= count>2 ? firstheight / (count-2) : 0;
+  double max= count>2 ? firstheight / (count-2) : 1e6;

   double min=           firstheight / (count-1);
   max *= 1.1;
   min /= 1.1;
   double min=           firstheight / (count-1);
   max *= 1.1;
   min /= 1.1;