solstice

commit 6b3438005e42431c664c9c1012c71e4c2ebdaa90
parent 61b790042233aab17745d60e6920df097a599820
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 25 Apr 2017 15:19:14 +0200

Fix GCC warnings

Diffstat:
M
src/solstice_object.c
 | 
4
++--
M
src/test_solstice_simulation.c
 | 
2
+-

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/solstice_object.c b/src/solstice_object.c
@@ -113,7 +113,7 @@ get_circular(const size_t ivert, double position[2], void* ctx)
 {
   struct solparser_circleclip* data = (struct solparser_circleclip*)ctx;
   const double a = (double)ivert * 2 * PI / (double)data->segments;
-  ASSERT(ivert < data->segments);
+  ASSERT(ivert < (size_t)data->segments);
   position[0] = data->radius * cos(a);
   position[1] = data->radius * sin(a);
 }
@@ -372,7 +372,7 @@ create_ssol_shape_punched_surface
         break;
       case SOLPARSER_CLIP_CONTOUR_CIRCLE:
         carvings[iclip].get = get_circular;
-        carvings[iclip].nb_vertices = clip->circle.segments;
+        carvings[iclip].nb_vertices = (size_t)clip->circle.segments;
         carvings[iclip].operation = solparser_clip_op_to_ssol_clipping_op(clip->op);
         carvings[iclip].context = (void*)&clip->circle;
         break;
diff --git a/src/test_solstice_simulation.c b/src/test_solstice_simulation.c
@@ -296,7 +296,7 @@ read_primary
   CHECK(
     sscanf(line,
       "%s %*u   "
-      "%lg %*lu %lg   "
+      "%lg %*u %lg   "
       "%lg %lg\n",
       name, /* ID */
       area, /* count, */ cos,