From 8d8ec5b2681da7579851dc0e44f2d2b909195e1e Mon Sep 17 00:00:00 2001
From: torset
Date: Thu, 29 Jan 2009 15:32:39 +0000
Subject: Update

---
 src/operations/interface/int_OpSlash.h | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'src/operations/interface/int_OpSlash.h')

diff --git a/src/operations/interface/int_OpSlash.h b/src/operations/interface/int_OpSlash.h
index 40c135e5..440b05a0 100644
--- a/src/operations/interface/int_OpSlash.h
+++ b/src/operations/interface/int_OpSlash.h
@@ -38,19 +38,23 @@
 
 
 #define s0s2OpSlashs2(in1,in2,size,out)			{int i=0;\
-									for (i=0;i<size[0]*size[1];i++) out[i]=in1/in2[i];}
+									sinverma(in2,out,size[0]);\
+									for (i=0;i<size[0]*size[1];i++) out[i]=in1*out[i];}
 
 
 #define d0d2OpSlashd2(in1,in2,size,out)			{int i=0;\
-									for (i=0;i<size[0]*size[1];i++) out[i]=in1/in2[i];}
+									dinverma(in2,out,size[0]);\
+									for (i=0;i<size[0]*size[1];i++) out[i]=in1*out[i];}
 									
 									
 #define c0c2OpSlashc2(in1,in2,size,out)			{int i=0;\
-									for (i=0;i<size[0]*size[1];i++) out[i]=crdivs(in1,in2[i]);}
+									cinverma(in2,out,size[0]);\
+									for (i=0;i<size[0]*size[1];i++) out[i]=cmuls(in1,out[i]);}
 
 
 #define z0z2OpSlashz2(in1,in2,size,out)			{int i=0;\
-									for (i=0;i<size[0]*size[1];i++) out[i]=zrdivs(in1,in2[i]);}
+									zinverma(in2,out,size[0]);\
+									for (i=0;i<size[0]*size[1];i++) out[i]=zmuls(in1,out[i]);}
 
 
 
@@ -60,13 +64,17 @@
 #define d0z2OpSlashz2(in1,in2,size,out)			z0z2OpSlashz2(DoubleComplex(in1,0),in2,size,out)
 
 
-
+/* FIXME: malloc */
 #define c0s2OpSlashc2(in1,in2,size,out)			{int i=0;\
-									for (i=0;i<size[0]*size[1];i++) out[i]=crdivs(in1,FloatComplex(in2[i],0));}
-
+									float* temp = malloc((uint)(size[0]*size[1])*sizeof(float));\
+									sinverma(in2,temp,size[0]);\
+									for (i=0;i<size[0]*size[1];i++) out[i]=cmuls(in1,FloatComplex(temp[i],0));}
 
+/* FIXME: malloc */
 #define z0d2OpSlashz2(in1,in2,size,out)			{int i=0;\
-									for (i=0;i<size[0]*size[1];i++) out[i]=zrdivs(in1,DoubleComplex(in2[i],0));}
+									double* temp = malloc((uint)(size[0]*size[1])*sizeof(double));\
+									dinverma(in2,temp,size[0]);\
+									for (i=0;i<size[0]*size[1];i++) out[i]=zmuls(in1,DoubleComplex(temp[i],0));}
 
 
 /* Matrix / Scalar */
-- 
cgit