From 295a9815e8ace3b277357cb447fecaece9703dcb Mon Sep 17 00:00:00 2001 From: Leonid Beynenson Date: Tue, 20 Mar 2012 12:14:41 +0000 Subject: [PATCH] Removed unrequired type conversions in the function clipLine. --- modules/core/src/drawing.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/core/src/drawing.cpp b/modules/core/src/drawing.cpp index b8eb1dd34e..3d1dc3a994 100644 --- a/modules/core/src/drawing.cpp +++ b/modules/core/src/drawing.cpp @@ -94,14 +94,14 @@ bool clipLine( Size img_size, Point& pt1, Point& pt2 ) if( c1 & 12 ) { a = c1 < 8 ? 0 : bottom; - x1 += (int64) (((int64) (a - y1)) * (x2 - x1) / (y2 - y1)); + x1 += (a - y1) * (x2 - x1) / (y2 - y1); y1 = a; c1 = (x1 < 0) + (x1 > right) * 2; } if( c2 & 12 ) { a = c2 < 8 ? 0 : bottom; - x2 += (int64) (((int64) (a - y2)) * (x2 - x1) / (y2 - y1)); + x2 += (a - y2) * (x2 - x1) / (y2 - y1); y2 = a; c2 = (x2 < 0) + (x2 > right) * 2; } @@ -110,14 +110,14 @@ bool clipLine( Size img_size, Point& pt1, Point& pt2 ) if( c1 ) { a = c1 == 1 ? 0 : right; - y1 += (int64) (((int64) (a - x1)) * (y2 - y1) / (x2 - x1)); + y1 += (a - x1) * (y2 - y1) / (x2 - x1); x1 = a; c1 = 0; } if( c2 ) { a = c2 == 1 ? 0 : right; - y2 += (int64) (((int64) (a - x2)) * (y2 - y1) / (x2 - x1)); + y2 += (a - x2) * (y2 - y1) / (x2 - x1); x2 = a; c2 = 0; }