Changeset 826 for soft/giet_vm/applications/rosenfeld/nrc2/src/nrset2x.c

Timestamp:

Jul 13, 2017, 11:01:58 AM (7 years ago)

Author:

meunier

Message:

• Mise à jour NR2 et Rosenfeld

File:

• soft/giet_vm/applications/rosenfeld/nrc2/src/nrset2x.c (modified) (2 diffs)

soft/giet_vm/applications/rosenfeld/nrc2/src/nrset2x.c

@@ -16 +16 @@
 #include <stddef.h>
 #include <stdlib.h>
-#include <math.h> // fabs
 
 #include "mypredef.h"
@@ -30 +29 @@
 
 
-/* --------------------------------------------------------------------------------- */
-IMAGE_EXPORT(void) zero_si32Pmatrix(si32Point **m, long nrl,long nrh,long ncl,long nch)
-/* --------------------------------------------------------------------------------- */
-{
-    long i,j;
-    si32Point *mi;
-    
-    for(i=nrl; i<=nrh; i++) {
-        mi = m[i];
-        for(j=ncl; j<=nch; j++) {
-            mi[j].x = 0;
-            mi[j].y = 0;
-        }
-    }
+#undef zero_type_matrix
+#define zero_type_matrix(t) \
+void short_name(t,zero_,matrix)(t ** m, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch) \
+{                                              \
+    t * mi;                                    \
+    for (int32_t i = nrl; i <= nrh; i++) {     \
+        mi = m[i];                             \
+        for (int32_t j = ncl; j <= nch; j++) { \
+            mi[j].x = 0;                       \
+            mi[j].y = 0;                       \
+            INIT_Z;                            \
+        }                                      \
+    }                                          \
 }
-/* ------------------------------------------------------------------------------- */
-IMAGE_EXPORT(void) zero_f32Pmatrix(f32Point **m, long nrl,long nrh,long ncl,long nch)
-/* ------------------------------------------------------------------------------- */
-{
-    long i,j;
-    f32Point *mi;
-    
-    for(i=nrl; i<=nrh; i++) {
-        mi = m[i];
-        for(j=ncl; j<=nch; j++) {
-            mi[j].x = 0;
-            mi[j].y = 0;
-        }
-    }
-}
-/* ----------------------------------------------------------------------------------- */
-IMAGE_EXPORT(void) zero_si32Tmatrix(si32Triplet **m, long nrl,long nrh,long ncl,long nch)
-/* ----------------------------------------------------------------------------------- */
-{
-    long i,j;
-    si32Triplet *mi;
-    
-    for(i=nrl; i<=nrh; i++) {
-        mi = m[i];
-        for(j=ncl; j<=nch; j++) {
-            mi[j].x = 0;
-            mi[j].y = 0;
-            mi[j].z = 0;
-        }
-    }
-}
-/* --------------------------------------------------------------------------------- */
-IMAGE_EXPORT(void) zero_f32Tmatrix(f32Triplet **m, long nrl,long nrh,long ncl,long nch)
-/* --------------------------------------------------------------------------------- */
-{
-    long i,j;
-    f32Triplet *mi;
-    
-    for(i=nrl; i<=nrh; i++) {
-        mi = m[i];
-        for(j=ncl; j<=nch; j++) {
-            mi[j].x = 0;
-            mi[j].y = 0;
-            mi[j].z = 0;
-        }
-    }
-}
+
+#define INIT_Z
+zero_type_matrix(si16Point);
+zero_type_matrix(ui16Point);
+zero_type_matrix(si32Point);
+zero_type_matrix(ui32Point);
+zero_type_matrix(f32Point);
+#undef INIT_Z
+#define INIT_Z ({ mi[j].z = 0; })
+zero_type_matrix(si16Triplet);
+zero_type_matrix(ui16Triplet);
+zero_type_matrix(si32Triplet);
+zero_type_matrix(ui32Triplet);
+zero_type_matrix(f32Triplet);
+
+
+
+// Local Variables:
+// tab-width: 4
+// c-basic-offset: 4
+// c-file-offsets:((innamespace . 0)(inline-open . 0))
+// indent-tabs-mode: nil
+// End:
+
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=4:softtabstop=4
+