From b91e005277f360e7513310eb87a5f8081f02c1c6 Mon Sep 17 00:00:00 2001
From: Alex Shvartzkop <dudesuchamazing@gmail.com>
Date: Sat, 8 Mar 2025 23:20:13 +0300
Subject: [PATCH] Pre-fetch segments in SHAPE_LINE_CHAIN::SelfIntersecting.
---
libs/kimath/src/geometry/shape_line_chain.cpp | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/libs/kimath/src/geometry/shape_line_chain.cpp b/libs/kimath/src/geometry/shape_line_chain.cpp
index d26828a9cb..944d0ddf97 100644
--- a/libs/kimath/src/geometry/shape_line_chain.cpp
+++ b/libs/kimath/src/geometry/shape_line_chain.cpp
@@ -1967,13 +1967,19 @@ bool SHAPE_LINE_CHAIN::CheckClearance( const VECTOR2I& aP, const int aDist ) con
const std::optional<SHAPE_LINE_CHAIN::INTERSECTION> SHAPE_LINE_CHAIN::SelfIntersecting() const
{
- for( int s1 = 0; s1 < SegmentCount(); s1++ )
- {
- const SEG cs1 = CSegment( s1 );
+ const size_t segCount = SegmentCount();
+ std::vector<SEG> segments( segCount );
- for( int s2 = s1 + 1; s2 < SegmentCount(); s2++ )
+ for( size_t s = 0; s < segCount; s++ )
+ segments[s] = CSegment( s );
+
+ for( size_t s1 = 0; s1 < segCount; s1++ )
+ {
+ const SEG& cs1 = segments[s1];
+
+ for( size_t s2 = s1 + 1; s2 < segCount; s2++ )
{
- const SEG cs2 = CSegment( s2 );
+ const SEG& cs2 = segments[s2];
const VECTOR2I s2a = cs2.A, s2b = cs2.B;
if( s1 + 1 != s2 && cs1.Contains( s2a ) )
@@ -1988,7 +1994,7 @@ const std::optional<SHAPE_LINE_CHAIN::INTERSECTION> SHAPE_LINE_CHAIN::SelfInters
// for closed polylines, the ending point of the
// last segment == starting point of the first segment
// this is a normal case, not self intersecting case
- !( IsClosed() && s1 == 0 && s2 == SegmentCount()-1 ) )
+ !( IsClosed() && s1 == 0 && s2 == segCount - 1 ) )
{
INTERSECTION is;
is.index_our = s1;