Changeset 821 for soft/giet_vm/applications/rosenfeld/nrc2/include/nrarith2x.h

Timestamp:

May 6, 2016, 3:06:29 PM (8 years ago)

Author:

meunier

Message:

• Added several versions of rosenfeld: { SLOW, FAST } x { FEATURES, NO_FEATURES }
• Added native linux compilation support
• Added a script to check results natively
• Started to refactor nrc code

File:

• soft/giet_vm/applications/rosenfeld/nrc2/include/nrarith2x.h (modified) (1 diff)

soft/giet_vm/applications/rosenfeld/nrc2/include/nrarith2x.h

@@ -11 +11 @@
 #define _NRARITH2X_H_
 
-#ifdef __cplusplus
-#ifdef PRAGMA_VERBOSE
-#pragma message ("C++")
-#endif
-extern "C" {
-#endif
+// Add conditionnel
 
-#ifdef PRAGMA_VERBOSE
-#pragma message("- include nrarith2x.h")
-#endif
+#define addcnz_type_matrix(t) \
+void short_name(t,addcnz_,matrix)(t ** src, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, t cte, t ** dst)
+
+addcnz_type_matrix(int8_t);
+addcnz_type_matrix(uint8_t);
+addcnz_type_matrix(int16_t);
+addcnz_type_matrix(uint16_t);
+addcnz_type_matrix(int32_t);
+addcnz_type_matrix(uint32_t);
+addcnz_type_matrix(int64_t);
+addcnz_type_matrix(uint64_t);
+addcnz_type_matrix(float);
+addcnz_type_matrix(double);
 
 
-    // Add conditionnel
-IMAGE_EXPORT(void) addc_bmatrix (byte   **src,long nrl,long nrh,long ncl, long nch, byte  cte, byte   **dst);
-IMAGE_EXPORT(void) addc_smatrix (sint16  **src,long nrl,long nrh,long ncl, long nch, short cte, sint16  **dst);
-IMAGE_EXPORT(void) addc_usmatrix(uint16 **src,long nrl,long nrh,long ncl, long nch, short cte, uint16 **dst);
+#define addandc_type_matrix(t) \
+void short_name(t,addandc_,matrix)(t ** src, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, t cte, t ** dst)
 
-IMAGE_EXPORT(void) addandc_bmatrix    (byte   **src,long nrl,long nrh,long ncl, long nch, byte  cte, byte   **dst);
-IMAGE_EXPORT(void) addandc_si16matrix (sint16 **src,long nrl,long nrh,long ncl, long nch, short cte, sint16  **dst);
-IMAGE_EXPORT(void) addandc_ui16matrix (uint16 **src,long nrl,long nrh,long ncl, long nch, short cte, uint16 **dst);
+addandc_type_matrix(int8_t);
+addandc_type_matrix(uint8_t);
+addandc_type_matrix(int16_t);
+addandc_type_matrix(uint16_t);
+addandc_type_matrix(int32_t);
+addandc_type_matrix(uint32_t);
+addandc_type_matrix(int64_t);
+addandc_type_matrix(uint64_t);
+addandc_type_matrix(float);
+addandc_type_matrix(double);
 
-IMAGE_EXPORT(void) addcnz_bmatrix(byte  **src,long nrl,long nrh,long ncl, long nch, byte  cte, byte  **dst);
 
-IMAGE_EXPORT(int) count_bmatrix(byte **m, long nrl,long nrh,long ncl, long nch);
-/*
- * renvoie la somme des points de la matrice
- */
+/* renvoie la somme des points de la matrice */
 
-#ifdef __cplusplus
-}
-#endif
+#define sum_type_matrix(t,rt) \
+rt short_name(t,sum_,matrix)(t ** m, int32_t nrl, int32_t nrh,int32_t ncl, int32_t nch)
+
+sum_type_matrix(int8_t, int32_t);
+sum_type_matrix(uint8_t, uint32_t);
+sum_type_matrix(int16_t, int32_t);
+sum_type_matrix(uint16_t, uint32_t);
+sum_type_matrix(int32_t, int64_t);
+sum_type_matrix(uint32_t, uint64_t);
+sum_type_matrix(int64_t, int64_t);
+sum_type_matrix(uint64_t, uint64_t);
+sum_type_matrix(float, float);
+sum_type_matrix(double, double);
+
+
 
 #endif /* _NRUTIL_H_ */
+
+// 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
+