potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2025-11-17 12:30:39 +03:00
parent d1da626502 6f74546488
commit 1b6fb61b89
64 changed files with 988 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/drawing.cpp
+12
View File
@@ -1647,6 +1647,18 @@ ThickLine( Mat& img, Point2l p0, Point2l p1, const void* color,
{
static const double INV_XY_ONE = 1./static_cast<double>(XY_ONE);
Rect_<int64> boundingRect(Point2l(0, 0), (Size2l)img.size());
if( (thickness > 1) && (shift == 0) && ( !boundingRect.contains(p0) || !boundingRect.contains(p1) ) )
{
const int margin = thickness;
const Point2l offset(margin, margin);
p0 += offset;
p1 += offset;
clipLine(Size2l(boundingRect.width+2*margin, boundingRect.height+2*margin), p0, p1);
p0 -= offset;
p1 -= offset;
}
p0.x <<= XY_SHIFT - shift;
p0.y <<= XY_SHIFT - shift;
p1.x <<= XY_SHIFT - shift;