star-enclosures-2d

commit 884625a61c4bd617f5e4ac38685c987cbcd2efac
parent 05327e214696872098e79659cb02652ba7dfa309
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Sat,  4 Jul 2020 18:15:44 +0200

Merge branch 'release_0.5.1'

Diffstat:
M
README.md
 | 
7
+++++--
M
cmake/CMakeLists.txt
 | 
2
+-
M
src/senc2d_scene_analyze.c
 | 
4
++--

3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
@@ -42,12 +42,16 @@ in star-enclosures-3d but is still present in star-enclosures-2d.
 Release notes
 -------------
 
+### Version 0.5.1
+
+-   Fix a warning
+
 ### Version 0.5
 
 -   Compute volume (in m^2) and surface (in m) of enclosures.
 
 -   Report overlapping segments.
-    Only segments with a common edge are currently detected.
+    Only segments with a common vertex are currently detected.
     Do not extract enclosures anymore when overlapping segments are
     detected.
 
@@ -57,7 +61,6 @@ Release notes
 
 -   More robust on invalid scenes.
 
-
 ### Version 0.4.2
 
 -   Fix global id of segments; releases 0.4.0 and 0.4.1 are broken
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -64,7 +64,7 @@ endif()
 ################################################################################
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 5)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
 set(SENC2D_FILES_SRC
diff --git a/src/senc2d_scene_analyze.c b/src/senc2d_scene_analyze.c
@@ -1278,10 +1278,10 @@ scene_analyze
 
     #pragma omp single
     {
-      res_T tmp_res = RES_OK;
       /* Save all the overlapping segments in a darray */
-      ASSERT(overlaps_initialized);
+      res_T tmp_res = RES_OK;
       struct htable_overlap_iterator it, end;
+      ASSERT(overlaps_initialized);
       htable_overlap_begin(&overlaps, &it);
       htable_overlap_end(&overlaps, &end);
       tmp_res = darray_seg_id_reserve(&scn->analyze.overlapping_ids,