summaryrefslogtreecommitdiff
path: root/2.3-1/src/c/auxiliaryFunctions/interfaces
diff options
context:
space:
mode:
authorsiddhu89902016-08-29 10:47:52 +0530
committersiddhu89902016-08-29 10:47:52 +0530
commit53ddbeb8c94cd71d37064d6d7e8ac56fef7ae5af (patch)
treeb002757ff60da2d674fc8690fcabbc544e0f7f2f /2.3-1/src/c/auxiliaryFunctions/interfaces
parent425ae9b5508196bc39ab98f12696550dfa6f872c (diff)
downloadScilab2C-53ddbeb8c94cd71d37064d6d7e8ac56fef7ae5af.tar.gz
Scilab2C-53ddbeb8c94cd71d37064d6d7e8ac56fef7ae5af.tar.bz2
Scilab2C-53ddbeb8c94cd71d37064d6d7e8ac56fef7ae5af.zip
OpenCV interface changed from c to c++
Diffstat (limited to '2.3-1/src/c/auxiliaryFunctions/interfaces')
-rw-r--r--2.3-1/src/c/auxiliaryFunctions/interfaces/int_conj.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/2.3-1/src/c/auxiliaryFunctions/interfaces/int_conj.h b/2.3-1/src/c/auxiliaryFunctions/interfaces/int_conj.h
index fec555b2..7884c99f 100644
--- a/2.3-1/src/c/auxiliaryFunctions/interfaces/int_conj.h
+++ b/2.3-1/src/c/auxiliaryFunctions/interfaces/int_conj.h
@@ -15,7 +15,7 @@
#ifndef __INT_CONJ_H__
#define __INT_CONJ_H__
-#define copy(in,size,out) {int i;for (i=0; i<size[0]*size[1];i++) out[i]=in[i];}
+#define copy_c(in,size,out) {int i;for (i=0; i<size[0]*size[1];i++) out[i]=in[i];}
#define s0conjs0(in) in
@@ -33,20 +33,20 @@
#define i160conji160(in) in
-#define s2conjs2(in,size,out) copy(in,size,out)
+#define s2conjs2(in,size,out) copy_c(in,size,out)
-#define d2conjd2(in,size,out) copy(in,size,out)
+#define d2conjd2(in,size,out) copy_c(in,size,out)
#define c2conjc2(in,size,out) cconja(in, size[0]*size[1], out)
#define z2conjz2(in,size,out) zconja(in, size[0]*size[1], out)
-#define u82conju82(in,size,out) copy(in,size,out)
+#define u82conju82(in,size,out) copy_c(in,size,out)
-#define i82conji82(in,size,out) copy(in,size,out)
+#define i82conji82(in,size,out) copy_c(in,size,out)
-#define u162conju162(in,size,out) copy(in,size,out)
+#define u162conju162(in,size,out) copy_c(in,size,out)
-#define i162conji162(in,size,out) copy(in,size,out)
+#define i162conji162(in,size,out) copy_c(in,size,out)
#endif /* !__INT_CONJ_H__ */