clipper2: Update to 1.5.4

This commit is contained in:
Jakub Marcowski 2025-06-09 12:24:13 +02:00
parent 8f87e60307
commit 7087fa15d8
No known key found for this signature in database
GPG key ID: 10D9E07CFFBC0E6F
3 changed files with 6 additions and 7 deletions

View file

@ -120,7 +120,7 @@ Files extracted from upstream source:
## clipper2 ## clipper2
- Upstream: https://github.com/AngusJohnson/Clipper2 - Upstream: https://github.com/AngusJohnson/Clipper2
- Version: 1.5.3 (fa165fe8364b7d0e5d5db2182369b8c82348f4ea, 2025) - Version: 1.5.4 (ef88ee97c0e759792e43a2b2d8072def6c9244e8, 2025)
- License: BSL 1.0 - License: BSL 1.0
Files extracted from upstream source: Files extracted from upstream source:

View file

@ -1,6 +1,6 @@
#ifndef CLIPPER_VERSION_H #ifndef CLIPPER_VERSION_H
#define CLIPPER_VERSION_H #define CLIPPER_VERSION_H
constexpr auto CLIPPER2_VERSION = "1.5.3"; constexpr auto CLIPPER2_VERSION = "1.5.4";
#endif // CLIPPER_VERSION_H #endif // CLIPPER_VERSION_H

View file

@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* Author : Angus Johnson * * Author : Angus Johnson *
* Date : 4 May 2025 * * Date : 30 May 2025 *
* Website : https://www.angusj.com * * Website : https://www.angusj.com *
* Copyright : Angus Johnson 2010-2025 * * Copyright : Angus Johnson 2010-2025 *
* Purpose : This is the main polygon clipping module * * Purpose : This is the main polygon clipping module *
@ -2119,9 +2119,8 @@ namespace Clipper2Lib {
e->prev_in_sel = e->prev_in_ael; e->prev_in_sel = e->prev_in_ael;
e->next_in_sel = e->next_in_ael; e->next_in_sel = e->next_in_ael;
e->jump = e->next_in_sel; e->jump = e->next_in_sel;
if (e->join_with == JoinWith::Left) // it is safe to ignore 'joined' edges here because
e->curr_x = e->prev_in_ael->curr_x; // also avoids complications // if necessary they will be split in IntersectEdges()
else
e->curr_x = TopX(*e, top_y); e->curr_x = TopX(*e, top_y);
e = e->next_in_ael; e = e->next_in_ael;
} }