polygon

commit cb3bce481b5c317e84a6155d15855f1feebff54a
parent fa7690c5813ef2e98ef8d4cf2861daaa5c7e2f18
Author: vaplv <vaplv@free.fr>
Date:   Tue, 19 Oct 2021 10:18:23 +0200

Merge branch 'release_0.1.4'

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

3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
@@ -17,6 +17,10 @@ can be edited, built, tested and installed as any CMake project.
 
 ## Release notes
 
+### Version 0.1.4
+
+Fix warnings detected by gcc 11
+
 ### Version 0.1.3
 
 Sets the CMake minimum version to 3.1: since CMake 3.20, version 2.8 has become
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -38,7 +38,7 @@ rcmake_append_runtime_dirs(_runtime_dirs RSys)
 ################################################################################
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 1)
-set(VERSION_PATCH 3)
+set(VERSION_PATCH 4)
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
 set(POLYGON_FILES_SRC polygon.c)
diff --git a/src/test_polygon.c b/src/test_polygon.c
@@ -171,13 +171,13 @@ main(int argc, char** argv)
   CHK(polygon_vertices_count_get(poly, &nvertices) == RES_OK);
   CHK(nvertices == 0);
 
-  FOR_EACH(ivertex, 0, sizeof(vertices)/sizeof(float[3]))
+  FOR_EACH(ivertex, 0, sizeof(vertices)/(3*sizeof(float)))
     CHK(polygon_vertex_add(poly, vertices + ivertex * 3) == RES_OK);
 
   CHK(polygon_vertices_count_get(poly, &nvertices) == RES_OK);
-  CHK(nvertices == sizeof(vertices)/sizeof(float[3]));
+  CHK(nvertices == sizeof(vertices)/(3*sizeof(float)));
 
-  FOR_EACH(ivertex, 0, sizeof(vertices)/sizeof(float[3])) {
+  FOR_EACH(ivertex, 0, sizeof(vertices)/(3*sizeof(float))) {
     CHK(polygon_vertex_get(poly, ivertex, pos) == RES_OK);
     CHK(f3_eq_eps(pos, vertices + ivertex*3, 1.e-6f) == 1);
   }
@@ -197,8 +197,8 @@ main(int argc, char** argv)
 
   /* After the triangulation the input polygon may be unchanged */
   CHK(polygon_vertices_count_get(poly, &nvertices) == RES_OK);
-  CHK(nvertices == sizeof(vertices)/sizeof(float[3]));
-  FOR_EACH(ivertex, 0, sizeof(vertices)/sizeof(float[3])) {
+  CHK(nvertices == sizeof(vertices)/(3*sizeof(float)));
+  FOR_EACH(ivertex, 0, sizeof(vertices)/(3*sizeof(float))) {
     CHK(polygon_vertex_get(poly, ivertex, pos) == RES_OK);
     CHK(f3_eq_eps(pos, vertices + ivertex*3, 1.e-6f) == 1);
   }