Intermediate commit. Not to be used

1 files changed, 55 insertions, 0 deletions

diff --git a/src/c/operations/interfaces/int_OpLogOr.h b/src/c/operations/interfaces/int_OpLogOr.h
index b5d55fba..07039d1e 100644
--- a/src/c/operations/interfaces/int_OpLogOr.h
+++ b/src/c/operations/interfaces/int_OpLogOr.h
@@ -19,6 +19,14 @@
 
 #define Bool2Double(in)			((in) ? 1.0 : 0.0)
 
+#define Bool2Uint8(in)				((in) ? (uint8)1 : (uint8)0)
+
+#define Bool2Int8(in)				((in) ? (int8)1 : (int8)0)
+
+#define Bool2Uint16(in)				((in) ? (uint16)1 : (uint16)0)
+
+#define Bool2Int16(in)				((in) ? (int16)1 : (int16)0)
+
 /*scalar or scalar */
 
 #define s0s0OpLogOrs0(in1, in2)		Bool2Float(in1 != 0.0f || in2 != 0.0f)
@@ -37,6 +45,14 @@
 
 #define z0d0OpLogOrd0(in1, in2)		Bool2Double((zreals(in1) != 0.0 || zimags(in1) != 0.0) && in2 != 0.0)
 
+#define u80u80OpLogAndu80(in1, in2)		Bool2Uint8(in1 != 0 || in2 != 0)
+
+#define i80i80OpLogAndi80(in1, in2)		Bool2Int8(in1 != 0 || in2 != 0)
+
+#define u160u160OpLogAndu160(in1, in2)		Bool2Uint16(in1 != 0 || in2 != 0)
+
+#define i160i160OpLogAndi160(in1, in2)		Bool2Int16(in1 != 0 || in2 != 0)
+
 /*matrix or scalar */
 
 #define s2s0OpLogOrs2(in1, size1, in2, out)	{int i  = 0 ;\
@@ -63,6 +79,19 @@
 #define z2d0OpLogOrd2(in1, size1, in2, out)	{int i  = 0 ;\
                                          for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] =  Bool2Double((zreals(in1[i]) != 0.0 || zimags(in1[i]) != 0.0) && in2 != 0.0);}
 
+#define i82i80OpLogAndi82(in1, size1, in2, out)	{int i  = 0 ;\
+                                                  for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] =  Bool2Int8(in1[i] != 0 || in2 != 0);}
+
+#define u82u80OpLogAndu82(in1, size1, in2, out)	{int i  = 0 ;\
+                                                  for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] =  Bool2Uint8(in1[i] != 0 || in2 != 0);}
+
+#define u162u160OpLogAndu162(in1, size1, in2, out)	{int i  = 0 ;\
+                                                  for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] =  Bool2Uint16(in1[i] != 0 || in2 != 0);}
+
+#define i162i160OpLogAndi162(in1, size1, in2, out)	{int i  = 0 ;\
+                                                  for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] =  Bool2Int16(in1[i] != 0 || in2 != 0);}
+
+
 /*scalar or matrix */
 
 #define s0s2OpLogOrs2(in1, in2, size2, out)	{int i  = 0 ;\
@@ -88,6 +117,19 @@
 
 #define z0d2OpLogOrd2(in1, in2, size2, out)	{int i  = 0 ;\
                                          for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Double((zreals(in1) != 0.2 || zimags(in1) != 0.2) && in2[i] != 0.2);}
+
+#define u80u82OpLogAndu82(in1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ;  i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Uint8(in1 != 0 || in2[i] != 0);}
+
+#define i80i82OpLogAndi82(in1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ;  i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Int8(in1 != 0 || in2[i] != 0);}
+
+#define u160u162OpLogAndu162(in1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ;  i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Uint16(in1 != 0 || in2[i] != 0);}
+
+#define i160i162OpLogAndi162(in1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ;  i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Int16(in1 != 0 || in2[i] != 0);}
+
 /*matrix or matrix */
 
 #define s2s2OpLogOrs2(in1, size1, in2, size2, out)	{int i  = 0 ;\
@@ -113,4 +155,17 @@
 
 #define z2d2OpLogOrd2(in1, size1, in2, size2, out)	{int i  = 0 ;\
                                          for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Double((zreals(in1[i]) != 0.2 || zimags(in1[i]) != 0.2) && in2[i] != 0.2);}
+
+#define u82u82OpLogAndu82(in1, size1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Uint8(in1[i] != 0 || in2[i] != 0);}
+
+#define i82i82OpLogAndi82(in1, size1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Int8(in1[i] != 0 || in2[i] != 0);}
+
+#define u162u162OpLogAndu162(in1, size1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Uint16(in1[i] != 0 || in2[i] != 0);}
+
+#define i162i162OpLogAndi162(in1, size1, in2, size2, out)	{int i  = 0 ;\
+                                                 for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] =  Bool2Int16(in1[i] != 0 || in2[i] != 0);}
+
 #endif /* !__INT_OPLOGOR_H__ */