diff options
| author | jofret | 2010-04-08 07:56:17 +0000 |
|---|---|---|
| committer | jofret | 2010-04-08 07:56:17 +0000 |
| commit | 6bf392a3658ac00e7bcabb08ea8d69629a582479 (patch) | |
| tree | 7337da738bc1141a112abdfef17eaa5a7ca99416 /src/c/signalProcessing/crossCorr | |
| parent | 79547bb0423190526c0a7e70bb0374b4c3ce2a98 (diff) | |
| download | scilab2c-6bf392a3658ac00e7bcabb08ea8d69629a582479.tar.gz scilab2c-6bf392a3658ac00e7bcabb08ea8d69629a582479.tar.bz2 scilab2c-6bf392a3658ac00e7bcabb08ea8d69629a582479.zip | |
Change malloc.h -> stdlib.h
Diffstat (limited to 'src/c/signalProcessing/crossCorr')
| -rw-r--r-- | src/c/signalProcessing/crossCorr/ccrossCorra.c | 2 | ||||
| -rw-r--r-- | src/c/signalProcessing/crossCorr/dcrossCorra.c | 9 | ||||
| -rw-r--r-- | src/c/signalProcessing/crossCorr/scrossCorra.c | 2 | ||||
| -rw-r--r-- | src/c/signalProcessing/crossCorr/zcrossCorra.c | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/c/signalProcessing/crossCorr/ccrossCorra.c b/src/c/signalProcessing/crossCorr/ccrossCorra.c index 53656f60..e2c66412 100644 --- a/src/c/signalProcessing/crossCorr/ccrossCorra.c +++ b/src/c/signalProcessing/crossCorr/ccrossCorra.c @@ -11,7 +11,7 @@ * */ -#include <malloc.h> +#include <stdlib.h> #include "crossCorr.h" #include "conv2d.h" #include "conj.h" diff --git a/src/c/signalProcessing/crossCorr/dcrossCorra.c b/src/c/signalProcessing/crossCorr/dcrossCorra.c index 42287ca3..b02298fd 100644 --- a/src/c/signalProcessing/crossCorr/dcrossCorra.c +++ b/src/c/signalProcessing/crossCorr/dcrossCorra.c @@ -11,12 +11,10 @@ * */ -#include <malloc.h> +#include <stdlib.h> #include "crossCorr.h" #include "conv2d.h" - - void dcrossCorra(double* in1, int rows1, int cols1, double* in2, int rows2, int cols2, double* out){ double *in2Copy; int i; @@ -24,7 +22,10 @@ void dcrossCorra(double* in1, int rows1, int cols1, double* in2, int rows2, int in2Copy=(double*)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]; + for (i=0;i<(rows2*cols2);i++) + { + in2Copy[i]=in2[rows2*cols2-1-i]; + } dconv2da(in1, rows1, cols1, in2Copy, rows2, cols2, out); diff --git a/src/c/signalProcessing/crossCorr/scrossCorra.c b/src/c/signalProcessing/crossCorr/scrossCorra.c index fd0ed507..ddc9df76 100644 --- a/src/c/signalProcessing/crossCorr/scrossCorra.c +++ b/src/c/signalProcessing/crossCorr/scrossCorra.c @@ -11,7 +11,7 @@ * */ -#include <malloc.h> +#include <stdlib.h> #include "crossCorr.h" #include "conv2d.h" diff --git a/src/c/signalProcessing/crossCorr/zcrossCorra.c b/src/c/signalProcessing/crossCorr/zcrossCorra.c index 4ff03f7b..f5659a36 100644 --- a/src/c/signalProcessing/crossCorr/zcrossCorra.c +++ b/src/c/signalProcessing/crossCorr/zcrossCorra.c @@ -11,7 +11,7 @@ * */ -#include <malloc.h> +#include <stdlib.h> #include "crossCorr.h" #include "conv2d.h" #include "conj.h" |