diff options
author | torset | 2009-01-29 08:48:41 +0000 |
---|---|---|
committer | torset | 2009-01-29 08:48:41 +0000 |
commit | 47eff0c4b795ab3a4461013bcb5f28188ed142ab (patch) | |
tree | 986eeb8576652a48a08d58a9c3ef105b7203f325 /src/operations/interface | |
parent | aa166e0b3bb650d1cb53b9e34b10282f4546d875 (diff) | |
download | scilab2c-47eff0c4b795ab3a4461013bcb5f28188ed142ab.tar.gz scilab2c-47eff0c4b795ab3a4461013bcb5f28188ed142ab.tar.bz2 scilab2c-47eff0c4b795ab3a4461013bcb5f28188ed142ab.zip |
Update
Diffstat (limited to 'src/operations/interface')
-rw-r--r-- | src/operations/interface/int_OpDotSlash.h | 12 | ||||
-rw-r--r-- | src/operations/interface/int_OpSlash.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/operations/interface/int_OpDotSlash.h b/src/operations/interface/int_OpDotSlash.h index b45e1e8d..87c79a81 100644 --- a/src/operations/interface/int_OpDotSlash.h +++ b/src/operations/interface/int_OpDotSlash.h @@ -115,16 +115,16 @@ #define c2s2OpDotSlashc2(in1,size1,in2,size2,out) {int i=0;\ - for (i=0;i<size[0]*size[1];i++) out[i]=crdivs(in1[i],FloatComplex(in2[i],0));} + for (i=0;i<size1[0]*size2[1];i++) out[i]=crdivs(in1[i],FloatComplex(in2[i],0));} #define s2c2OpDotSlashc2(in1,size1,in2,size2,out) {int i=0;\ - for (i=0;i<size[0]*size[1];i++) out[i]=crdivs(FloatComplex(in1[i],0),in2[i]);} + for (i=0;i<size1[0]*size2[1];i++) out[i]=crdivs(FloatComplex(in1[i],0),in2[i]);} -#define z2d2OpDotSlashc2(in1,size1,in2,size2,out) {int i=0;\ - for (i=0;i<size[0]*size[1];i++) out[i]=zrdivs(in1[i],DoubleComplex(in2[i],0));} +#define z2d2OpDotSlashz2(in1,size1,in2,size2,out) {int i=0;\ + for (i=0;i<size1[0]*size2[1];i++) out[i]=zrdivs(in1[i],DoubleComplex(in2[i],0));} -#define d2z2OpDotSlashc2(in1,size1,in2,size2,out) {int i=0;\ - for (i=0;i<size[0]*size[1];i++) out[i]=zrdivs(DoubleComplex(in1[i],0),in2[i]);} +#define d2z2OpDotSlashz2(in1,size1,in2,size2,out) {int i=0;\ + for (i=0;i<size1[0]*size2[1];i++) out[i]=zrdivs(DoubleComplex(in1[i],0),in2[i]);} diff --git a/src/operations/interface/int_OpSlash.h b/src/operations/interface/int_OpSlash.h index def50514..40c135e5 100644 --- a/src/operations/interface/int_OpSlash.h +++ b/src/operations/interface/int_OpSlash.h @@ -126,12 +126,12 @@ sfilla(temp,size1[0],size1[1],0);\ c2c2OpSlashc2(FloatComplexMatrix(in2,temp,size1[0]*size1[1]), size1, in2, size2, out);} -#define z2d2OpSlashc2(in1,size1,in2,size2,out) {double* temp;\ +#define z2d2OpSlashz2(in1,size1,in2,size2,out) {double* temp;\ temp=malloc((uint)(size2[0]*size2[1])*sizeof(double));\ dfilla(temp,size2[0],size2[1],0);\ z2z2OpSlashz2(in1, size1, DoubleComplexMatrix(in2,temp,size2[0]*size2[1]), size2, out);} -#define d2z2OpSlashc2(in1,size1,in2,size2,out) {double* temp;\ +#define d2z2OpSlashz2(in1,size1,in2,size2,out) {double* temp;\ temp=malloc((uint)(size2[0]*size2[1])*sizeof(double));\ dfilla(temp,size1[0],size1[1],0);\ z2z2OpSlashz2(DoubleComplexMatrix(in1,temp,size1[0]*size1[1]), size1, in2, size2, out);} |