summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjofret2009-04-22 06:25:28 +0000
committerjofret2009-04-22 06:25:28 +0000
commit44d9c34db9f75441e97109e140ad1ae4331dbec1 (patch)
tree333847fd2de96d3b705bd22e3f5a39e11407276a
parentaba4bbe4926457d7c780913d17f00a96bee5c85f (diff)
downloadscilab2c-44d9c34db9f75441e97109e140ad1ae4331dbec1.tar.gz
scilab2c-44d9c34db9f75441e97109e140ad1ae4331dbec1.tar.bz2
scilab2c-44d9c34db9f75441e97109e140ad1ae4331dbec1.zip
malloc
-rw-r--r--scilab2c/src/signalProcessing/crossCorr/ccrossCorra.c12
-rw-r--r--scilab2c/src/signalProcessing/crossCorr/dcrossCorra.c10
-rw-r--r--scilab2c/src/signalProcessing/crossCorr/scrossCorra.c12
-rw-r--r--scilab2c/src/signalProcessing/crossCorr/zcrossCorra.c14
4 files changed, 24 insertions, 24 deletions
diff --git a/scilab2c/src/signalProcessing/crossCorr/ccrossCorra.c b/scilab2c/src/signalProcessing/crossCorr/ccrossCorra.c
index bd61305b..9d8cd52e 100644
--- a/scilab2c/src/signalProcessing/crossCorr/ccrossCorra.c
+++ b/scilab2c/src/signalProcessing/crossCorr/ccrossCorra.c
@@ -11,7 +11,7 @@
*
*/
-
+#include <malloc.h>
#include "crossCorr.h"
#include "conv2d.h"
#include "conj.h"
@@ -19,15 +19,15 @@
void ccrossCorra(floatComplex* in1, int rows1, int cols1, floatComplex* in2, int rows2, int cols2, floatComplex* out){
floatComplex *in2Copy;
int i;
-
- in2Copy=malloc((uint)rows2*sizeof(floatComplex));
-
+
+ in2Copy=malloc((unsigned int)rows2*sizeof(floatComplex));
+
/* We change in2 to be in appropriate form in in2Copy*/
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);
+ free(in2Copy);
}
diff --git a/scilab2c/src/signalProcessing/crossCorr/dcrossCorra.c b/scilab2c/src/signalProcessing/crossCorr/dcrossCorra.c
index b34176a9..c981981a 100644
--- a/scilab2c/src/signalProcessing/crossCorr/dcrossCorra.c
+++ b/scilab2c/src/signalProcessing/crossCorr/dcrossCorra.c
@@ -11,7 +11,7 @@
*
*/
-
+#include <malloc.h>
#include "crossCorr.h"
#include "conv2d.h"
@@ -20,12 +20,12 @@
void dcrossCorra(double* in1, int rows1, int cols1, double* in2, int rows2, int cols2, double* out){
double *in2Copy;
int i;
-
- in2Copy=malloc((uint)(rows2*cols2)*sizeof(double));
-
+
+ in2Copy=malloc((unsigned int)(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/scilab2c/src/signalProcessing/crossCorr/scrossCorra.c b/scilab2c/src/signalProcessing/crossCorr/scrossCorra.c
index 9c592c2b..c38b90b7 100644
--- a/scilab2c/src/signalProcessing/crossCorr/scrossCorra.c
+++ b/scilab2c/src/signalProcessing/crossCorr/scrossCorra.c
@@ -11,21 +11,21 @@
*
*/
-
+#include <malloc.h>
#include "crossCorr.h"
#include "conv2d.h"
void scrossCorra(float* in1, int rows1, int cols1, float* in2, int rows2, int cols2, float* out){
float *in2Copy;
int i;
-
- in2Copy=malloc((uint)(rows2*cols2)*sizeof(float));
-
+
+ in2Copy=malloc((unsigned int)(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/scilab2c/src/signalProcessing/crossCorr/zcrossCorra.c b/scilab2c/src/signalProcessing/crossCorr/zcrossCorra.c
index fbb86217..ca66952b 100644
--- a/scilab2c/src/signalProcessing/crossCorr/zcrossCorra.c
+++ b/scilab2c/src/signalProcessing/crossCorr/zcrossCorra.c
@@ -11,7 +11,7 @@
*
*/
-
+#include <malloc.h>
#include "crossCorr.h"
#include "conv2d.h"
#include "conj.h"
@@ -19,16 +19,16 @@
void zcrossCorra(doubleComplex* in1, int rows1, int cols1, doubleComplex* in2, int rows2, int cols2, doubleComplex* out){
doubleComplex *in2Copy;
int i;
-
- in2Copy=malloc((uint)(rows2*cols2)*sizeof(doubleComplex));
-
+
+ in2Copy=malloc((unsigned int)(rows2*cols2)*sizeof(doubleComplex));
+
/* We change in2 to be in appropriate form in in2Copy*/
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);
-
+ free(in2Copy);
+
}