star-geometry-2d

commit 1bb3fd019c66014f305b386cc9f2d3e355cd7b88
parent 7f1ce0da3e20823acaa97bd1e4bc1e7fce596107
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Tue,  3 Mar 2020 14:28:19 +0100

Small changes in asserts

Diffstat:
M
src/sg2d_misc.h
 | 
2
--
M
src/sg2d_sXd_helper.h
 | 
18
+++++++-----------
M
src/sg2d_sencXd_helper.h
 | 
12
+++---------

3 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/src/sg2d_misc.h b/src/sg2d_misc.h
@@ -16,8 +16,6 @@
 #ifndef SG2D_MISC_H__
 #define SG2D_MISC_H__
 
-#define ERR(Expr) if((res = (Expr)) != RES_OK) goto error;
-
 #include <rsys/dynamic_array.h>
 
 #define ERR(Expr) if((res = (Expr)) != RES_OK) goto error;
diff --git a/src/sg2d_sXd_helper.h b/src/sg2d_sXd_helper.h
@@ -20,7 +20,6 @@
 #include <star/senc2d.h>
 
 #include <rsys/rsys.h>
-#include <rsys/float2.h>
 
 #include <limits.h>
 
@@ -35,12 +34,10 @@ sg2d_sXd_geometry_get_indices
 {
   const struct sg2d_geometry* geometry = ctx;
   int i;
-  size_t tmp[3];
-  res_T r;
+  size_t tmp[SG2D_GEOMETRY_DIMENSION];
   ASSERT(indices && geometry);
-  r = sg2d_geometry_get_unique_segment_vertices(geometry, iseg, tmp);
-  ASSERT(r == RES_OK); (void)r;
-  FOR_EACH(i, 0, 3) {
+  SG2D(geometry_get_unique_segment_vertices(geometry, iseg, tmp));
+  FOR_EACH(i, 0, SG2D_GEOMETRY_DIMENSION) {
     ASSERT(tmp[i] <= UINT_MAX);
     indices[i] = (unsigned)tmp[i];
   }
@@ -56,12 +53,11 @@ sg2d_sXd_geometry_get_position
    void* ctx)
 {
   const struct sg2d_geometry* geometry = ctx;
-  double tmp[2];
-  res_T r;
+  double tmp[SG2D_GEOMETRY_DIMENSION];
+  int i;
   ASSERT(coord && geometry);
-  r = sg2d_geometry_get_unique_vertex(geometry, ivert, tmp);
-  ASSERT(r == RES_OK); (void)r;
-  f2_set_d2(coord, tmp);
+  SG2D(geometry_get_unique_vertex(geometry, ivert, tmp));
+  FOR_EACH(i, 0, SG2D_GEOMETRY_DIMENSION) coord[i] = (float)tmp[i];
 }
 
 END_DECLS
diff --git a/src/sg2d_sencXd_helper.h b/src/sg2d_sencXd_helper.h
@@ -30,10 +30,8 @@ sg2d_sencXd_geometry_get_indices
    void* ctx)
 {
   const struct sg2d_geometry* geometry = ctx;
-  res_T r;
   ASSERT(indices && geometry);
-  r = sg2d_geometry_get_unique_segment_vertices(geometry, iseg, indices);
-  ASSERT(r == RES_OK); (void)r;
+  SG2D(geometry_get_unique_segment_vertices(geometry, iseg, indices));
 }
 
 /* Get vertex indices for the iseg_th segment.
@@ -46,10 +44,8 @@ sg2d_sencXd_geometry_get_media
 {
   const struct sg2d_geometry* geometry = ctx;
   size_t tmp[SG2D_PROP_TYPES_COUNT__];
-  res_T r;
   ASSERT(media && geometry);
-  r = sg2d_geometry_get_unique_segment_properties(geometry, iseg, tmp);
-  ASSERT(r == RES_OK); (void)r;
+  SG2D(geometry_get_unique_segment_properties(geometry, iseg, tmp));
   media[SENC2D_FRONT] = (tmp[SG2D_FRONT] == SG2D_UNSPECIFIED_PROPERTY)
     ? SENC2D_UNSPECIFIED_MEDIUM : tmp[SG2D_FRONT];
   media[SENC2D_BACK] = (tmp[SG2D_BACK] == SG2D_UNSPECIFIED_PROPERTY)
@@ -65,10 +61,8 @@ sg2d_sencXd_geometry_get_position
    void* ctx)
 {
   const struct sg2d_geometry* geometry = ctx;
-  res_T r;
   ASSERT(coord && geometry);
-  r = sg2d_geometry_get_unique_vertex(geometry, ivert, coord);
-  ASSERT(r == RES_OK); (void)r;
+  SG2D(geometry_get_unique_vertex(geometry, ivert, coord));
 }
 
 END_DECLS