From 2790257d385a9d7d9e0dab9205baf4b3df0dd8c8 Mon Sep 17 00:00:00 2001
From: siddhu8990
Date: Mon, 29 Aug 2016 10:47:52 +0530
Subject: OpenCV interface changed from c to c++

---
 src/c/auxiliaryFunctions/interfaces/int_conj.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/c/auxiliaryFunctions/interfaces/int_conj.h')

diff --git a/src/c/auxiliaryFunctions/interfaces/int_conj.h b/src/c/auxiliaryFunctions/interfaces/int_conj.h
index fec555b..7884c99 100644
--- a/src/c/auxiliaryFunctions/interfaces/int_conj.h
+++ b/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__ */
-- 
cgit