X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=yarrg%2Fstructure.c;h=99042d0c74961c5b064c19875b8af0c89ce37dca;hp=f10addc56eed9c65f77ede4809407333a4ca780a;hb=1debcf64da6d259d6b514e1c91d253dc011e4011;hpb=c68fb80a6bbf7acbcac4b2cb2143f5fea745cd2b diff --git a/yarrg/structure.c b/yarrg/structure.c index f10addc..99042d0 100644 --- a/yarrg/structure.c +++ b/yarrg/structure.c @@ -313,12 +313,16 @@ void find_structure(const CanonImage *im, #define CHECK_STRIP_BORDER(tlbr,xy,increm) \ do { \ - Point csb_p; \ + Point csb_p, csb_p2; \ Rect csb_r; \ csb_p= s.mr.tl; \ csb_p.x++; csb_p.y++; \ + csb_p2= csb_p; \ + csb_p2.x++; csb_p2.y++; \ csb_p.xy= s.mr.tlbr.xy; \ - if (get_p(csb_p)=='+') { \ + csb_p2.xy= s.mr.tlbr.xy; \ + if (get_p(csb_p)=='+' && \ + get_p(csb_p2)=='+') { \ csb_r= s.mr; \ csb_r.tl.xy= csb_p.xy; \ csb_r.br.xy= csb_p.xy; \