Skip to content

Commit 7087fa1

Browse files
committed
clipper2: Update to 1.5.4
1 parent 8f87e60 commit 7087fa1

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

thirdparty/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Files extracted from upstream source:
120120
## clipper2
121121

122122
- Upstream: https://github.com/AngusJohnson/Clipper2
123-
- Version: 1.5.3 (fa165fe8364b7d0e5d5db2182369b8c82348f4ea, 2025)
123+
- Version: 1.5.4 (ef88ee97c0e759792e43a2b2d8072def6c9244e8, 2025)
124124
- License: BSL 1.0
125125

126126
Files extracted from upstream source:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#ifndef CLIPPER_VERSION_H
22
#define CLIPPER_VERSION_H
33

4-
constexpr auto CLIPPER2_VERSION = "1.5.3";
4+
constexpr auto CLIPPER2_VERSION = "1.5.4";
55

66
#endif // CLIPPER_VERSION_H

thirdparty/clipper2/src/clipper.engine.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*******************************************************************************
22
* Author : Angus Johnson *
3-
* Date : 4 May 2025 *
3+
* Date : 30 May 2025 *
44
* Website : https://www.angusj.com *
55
* Copyright : Angus Johnson 2010-2025 *
66
* Purpose : This is the main polygon clipping module *
@@ -2119,10 +2119,9 @@ namespace Clipper2Lib {
21192119
e->prev_in_sel = e->prev_in_ael;
21202120
e->next_in_sel = e->next_in_ael;
21212121
e->jump = e->next_in_sel;
2122-
if (e->join_with == JoinWith::Left)
2123-
e->curr_x = e->prev_in_ael->curr_x; // also avoids complications
2124-
else
2125-
e->curr_x = TopX(*e, top_y);
2122+
// it is safe to ignore 'joined' edges here because
2123+
// if necessary they will be split in IntersectEdges()
2124+
e->curr_x = TopX(*e, top_y);
21262125
e = e->next_in_ael;
21272126
}
21282127
}

0 commit comments

Comments
 (0)