From 896c85bfd5a607cfb91e5fd24c858d2ddadc0216 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Sat, 12 Jun 2010 18:37:09 +1200 Subject: [PATCH] either clamp_intxy was out by 1, or all its callers were --- edges.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/edges.c b/edges.c index cc0d975..f11bf2f 100644 --- a/edges.c +++ b/edges.c @@ -119,12 +119,13 @@ corners_to_full_lut(GstSparrow *sparrow, sparrow_find_lines_t *fl){ #define FLOATXY(x)(((double)(x)) / (1 << SPARROW_FIXED_POINT)) static inline int -clamp_intxy(int x, const int max){ +clamp_intxy(int x, const int max_plus_one){ if (x < 0) return 0; - if (x >= max << SPARROW_FIXED_POINT) - return max; - return x / (1 << SPARROW_FIXED_POINT); + x >>= SPARROW_FIXED_POINT; + if (x >= max_plus_one) + return max_plus_one - 1; + return x; } static void -- 2.11.4.GIT