From b1275610923e7317ef61e66b1e1acddd92978f6e Mon Sep 17 00:00:00 2001
From: simon
Date: Fri, 24 Jul 2009 08:18:40 +0000
Subject: corrected interfaces for spec and OpRc

---
 src/c/matrixOperations/interfaces/int_OpRc.h | 16 ++++++++++------
 src/c/matrixOperations/interfaces/int_spec.h |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/c/matrixOperations/interfaces')

diff --git a/src/c/matrixOperations/interfaces/int_OpRc.h b/src/c/matrixOperations/interfaces/int_OpRc.h
index 72ca0b0c..1e8f1c92 100644
--- a/src/c/matrixOperations/interfaces/int_OpRc.h
+++ b/src/c/matrixOperations/interfaces/int_OpRc.h
@@ -85,18 +85,22 @@
 										}
 
 /* Different type */
-#define s2c0OpRcc2(in1,size,in2,out)				sfilla((float *)out,size[0],size[1],0);  \
-										c2c0OpRcc2(FloatComplexMatrix(in1,(float*)out,size[0]*size[1]),size,in2,out)
+#define s2c0OpRcc2(in1,size,in2,out)				{ floatComplex temp=in2; \
+										sfilla((float *)out,size[0],size[1],0);  \
+										scolumncata(FloatComplexMatrix(in1,(float*)out,size[0]*size[1]), size[0], size[1], &temp , 1, 1, out); \
+										}
 
-#define d2z0OpRcz2(in1,size,in2,out)				dfilla((double *)out,size[0],size[1],0);  \
-										z2z0OpRcz2(DoubleComplexMatrix(in1,(double *)out,size[0]*size[1]),size,in2,out)
+#define d2z0OpRcz2(in1,size,in2,out)				{ doubleComplex temp=in2; \
+										dfilla((double *)out,size[0],size[1],0);  \
+										zcolumncata(DoubleComplexMatrix(in1,(double *)out,size[0]*size[1]), size[0], size[1], &temp , 1, 1, out); \
+										}
 
 #define c2s0OpRcc2(in1,size,in2,out)				{ floatComplex temp = FloatComplex(in2,0);   \
-										  c2c0OpRcc2(in1, size, temp, out) \
+										  ccolumncata(in1, size[0], size[1], &temp, 1, 1, out); \
 										}
 
 #define z2d0OpRcz2(in1,size,in2,out)				{ doubleComplex temp = DoubleComplex(in2,0);   \
-										  z2z0OpRcz2(in1, size, temp, out) \
+										   zcolumncata(in1, size[0], size[1], &temp, 1, 1, out); \
 										}
 
 /* Scalar-Matrix */
diff --git a/src/c/matrixOperations/interfaces/int_spec.h b/src/c/matrixOperations/interfaces/int_spec.h
index e25d7219..77ab55e7 100644
--- a/src/c/matrixOperations/interfaces/int_spec.h
+++ b/src/c/matrixOperations/interfaces/int_spec.h
@@ -28,7 +28,7 @@
 #define s2specc2(in,size,out)		{float* ZEROS;\
 						ZEROS=malloc((uint)(size[0]*size[0]*sizeof(float)));\
 						szerosa(ZEROS,size[0],size[0]);\
-						sspeca(FloatComplexMatrix(in,ZEROS,size[0]*size[0]), size[0], out);\
+						cspeca(FloatComplexMatrix(in,ZEROS,size[0]*size[0]), size[0], out);\
 						}
 
 #define d2specz2(in,size,out)		{double* ZEROS;\
-- 
cgit