diff options
author | torset | 2009-02-05 08:37:28 +0000 |
---|---|---|
committer | torset | 2009-02-05 08:37:28 +0000 |
commit | 3118121aaa26f0d96520d5626c3458817bb67003 (patch) | |
tree | 079be34beb2abf6b03c7dea4fb037538c7661e43 /src/signalProcessing/crossCorr | |
parent | 90daea74ec2e71b6d740f870663d768d062da7ae (diff) | |
download | scilab2c-3118121aaa26f0d96520d5626c3458817bb67003.tar.gz scilab2c-3118121aaa26f0d96520d5626c3458817bb67003.tar.bz2 scilab2c-3118121aaa26f0d96520d5626c3458817bb67003.zip |
Add free(to free the malloc) when missing
Diffstat (limited to 'src/signalProcessing/crossCorr')
-rw-r--r-- | src/signalProcessing/crossCorr/ccrossCorra.c | 3 | ||||
-rw-r--r-- | src/signalProcessing/crossCorr/dcrossCorra.c | 4 | ||||
-rw-r--r-- | src/signalProcessing/crossCorr/scrossCorra.c | 4 | ||||
-rw-r--r-- | src/signalProcessing/crossCorr/testDoubleCrossCorr.c | 2 | ||||
-rw-r--r-- | src/signalProcessing/crossCorr/testFloatCrossCorr.c | 2 | ||||
-rw-r--r-- | src/signalProcessing/crossCorr/zcrossCorra.c | 2 |
6 files changed, 12 insertions, 5 deletions
diff --git a/src/signalProcessing/crossCorr/ccrossCorra.c b/src/signalProcessing/crossCorr/ccrossCorra.c index 2310520e..bd61305b 100644 --- a/src/signalProcessing/crossCorr/ccrossCorra.c +++ b/src/signalProcessing/crossCorr/ccrossCorra.c @@ -26,7 +26,8 @@ void ccrossCorra(floatComplex* in1, int rows1, int cols1, floatComplex* in2, int for (i=0;i<(rows2*cols2);i++) in2Copy[i]=cconjs(in2[rows2*cols2-1-i]); cconv2da(in1, rows1, cols1, in2Copy, rows2, cols2, out); - + + free(in2Copy); } diff --git a/src/signalProcessing/crossCorr/dcrossCorra.c b/src/signalProcessing/crossCorr/dcrossCorra.c index e537f7f4..b34176a9 100644 --- a/src/signalProcessing/crossCorr/dcrossCorra.c +++ b/src/signalProcessing/crossCorr/dcrossCorra.c @@ -21,12 +21,14 @@ void dcrossCorra(double* in1, int rows1, int cols1, double* in2, int rows2, int double *in2Copy; int i; - in2Copy=malloc((uint)rows2*sizeof(double)); + in2Copy=malloc((uint)(rows2*cols2)*sizeof(double)); /* We change in2 to be in appropriate form in in2Copy*/ for (i=0;i<(rows2*cols2);i++) in2Copy[i]=in2[rows2*cols2-1-i]; dconv2da(in1, rows1, cols1, in2Copy, rows2, cols2, out); + + free(in2Copy); } diff --git a/src/signalProcessing/crossCorr/scrossCorra.c b/src/signalProcessing/crossCorr/scrossCorra.c index bd2013ed..9c592c2b 100644 --- a/src/signalProcessing/crossCorr/scrossCorra.c +++ b/src/signalProcessing/crossCorr/scrossCorra.c @@ -19,11 +19,13 @@ void scrossCorra(float* in1, int rows1, int cols1, float* in2, int rows2, int co float *in2Copy; int i; - in2Copy=malloc((uint)rows2*sizeof(float)); + in2Copy=malloc((uint)(rows2*cols2)*sizeof(float)); /* We change in2 to be in appropriate form in in2Copy*/ for (i=0;i<(rows2*cols2);i++) in2Copy[i]=in2[rows2*cols2-1-i]; sconv2da(in1, rows1, cols1, in2Copy, rows2, cols2, out); + + free(in2Copy); } diff --git a/src/signalProcessing/crossCorr/testDoubleCrossCorr.c b/src/signalProcessing/crossCorr/testDoubleCrossCorr.c index 20847fd3..96f00530 100644 --- a/src/signalProcessing/crossCorr/testDoubleCrossCorr.c +++ b/src/signalProcessing/crossCorr/testDoubleCrossCorr.c @@ -43,7 +43,7 @@ static void dcrossCorraTest(void){ } } - +/*FIXME : aucun test pour les complexes*/ static void zcrossCorraTest(void){ } diff --git a/src/signalProcessing/crossCorr/testFloatCrossCorr.c b/src/signalProcessing/crossCorr/testFloatCrossCorr.c index 603227ed..aace4b9e 100644 --- a/src/signalProcessing/crossCorr/testFloatCrossCorr.c +++ b/src/signalProcessing/crossCorr/testFloatCrossCorr.c @@ -29,7 +29,7 @@ static void scrossCorraTest(void){ } } - +/*FIXME : aucun test pour les complexes*/ static void ccrossCorraTest(void){ } diff --git a/src/signalProcessing/crossCorr/zcrossCorra.c b/src/signalProcessing/crossCorr/zcrossCorra.c index 49ac5a7a..fbb86217 100644 --- a/src/signalProcessing/crossCorr/zcrossCorra.c +++ b/src/signalProcessing/crossCorr/zcrossCorra.c @@ -26,6 +26,8 @@ void zcrossCorra(doubleComplex* in1, int rows1, int cols1, doubleComplex* in2, i for (i=0;i<(rows2*cols2);i++) in2Copy[i]=zconjs(in2[rows2*cols2-1-i]); zconv2da(in1, rows1, cols1, in2Copy, rows2, cols2, out); + + free(in2Copy); } |