diff options
Diffstat (limited to '2.3-1/src/c/elementaryFunctions/interfaces/int_nanmax.h')
| -rw-r--r-- | 2.3-1/src/c/elementaryFunctions/interfaces/int_nanmax.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_nanmax.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_nanmax.h index dd3df71d..6096290f 100644 --- a/2.3-1/src/c/elementaryFunctions/interfaces/int_nanmax.h +++ b/2.3-1/src/c/elementaryFunctions/interfaces/int_nanmax.h @@ -13,15 +13,14 @@ #ifndef __INT_NANMAX_H__ #define __INT_NANMAX_H__ -#define d2nanmaxd0(in1, size) dnanmaxa(in1,size[0]* size[1]) -#define d2g2nanmaxd2(in1, size1, in2, size2, out) (in2[0]=='r') ? dnanmaxrowa(in1, size1[0], size1[1], out) : dnanmaxcola(in1, size1[0] , size1[1], out) - -#define s2nanmaxs0(in1, size) snanmaxa(in1,size[0]* size[1]) -#define s2g2nanmaxs2(in1, size1, in2, size2, out) (in2[0]=='r') ? snanmaxrowa(in1, size1[0], size1[1], out) : snanmaxcola(in1, size1[0] , size1[1], out) - - -//#define i160i160pmoduloi160(in1, in2) i16pmodulos(in1,in2) -//#define i162i162pmoduloi162(in1, size1, in2, size2, out) i16pmoduloa(in1,size1[0]*size1[1],in2, out) - +#define d2nanmaxd0(in1, size) dnanmaxa(in1,size[0]* size[1]) +#define d2nanmaxd0d2(in1, size, out) dnanmax1a(in1,size[0], size[1], out) +#define d2g2nanmaxd2(in1, size1, in2, size2, out) (in2[0]=='r') ? dnanmaxrow1a(in1, size1[0], size1[1], out) : dnanmaxcol1a(in1, size1[0] , size1[1], out) +#define d2g2nanmaxd2d2(in1, size1, in2, size2, out1, out2) (in2[0]=='r') ? dnanmaxrowa(in1, size1[0], size1[1], out1, out2) : dnanmaxcola(in1, size1[0] , size1[1], out1, out2) + +#define s2nanmaxs0(in1, size) snanmaxa(in1,size[0]* size[1]) +#define s2nanmaxs0s2(in1, size, out) snanmax1a(in1,size[0], size[1], out) +#define s2g2nanmaxs2(in1, size1, in2, size2, out) (in2[0]=='r') ? snanmaxrow1a(in1, size1[0], size1[1], out) : snanmaxcol1a(in1, size1[0] , size1[1], out) +#define s2g2nanmaxs2s2(in1, size1, in2, size2, out1, out2) (in2[0]=='r') ? snanmaxrowa(in1, size1[0], size1[1], out1, out2) : snanmaxcola(in1, size1[0] , size1[1], out1, out2) #endif |