|
@@ -119,7 +119,7 @@ getDataFromSplitBinary (FILE *f, Matrix *ret)
|
|
|
}
|
|
|
|
|
|
static int
|
|
|
-readFilterFromFile (int isSmooth, int n, float *filter, int *filterlength)
|
|
|
+readFilterFromFile (int isSmooth, int n, float **filter, int *filterlength)
|
|
|
{
|
|
|
char filtname[64];
|
|
|
if (n != 0)
|
|
@@ -139,11 +139,11 @@ readFilterFromFile (int isSmooth, int n, float *filter, int *filterlength)
|
|
|
size_t size = ftell (f) / sizeof(float);
|
|
|
rewind (f);
|
|
|
|
|
|
- filter = (float*) malloc (size * sizeof (float));
|
|
|
+ *filter = (float*) malloc (size * sizeof (float));
|
|
|
|
|
|
- fread (filter, sizeof(float), size, f);
|
|
|
+ fread (*filter, sizeof(float), size, f);
|
|
|
|
|
|
- printf("%f\n", filter[0]);
|
|
|
+ printf("%f\n", *filter[0]);
|
|
|
|
|
|
*filterlength = size;
|
|
|
|
|
@@ -392,7 +392,7 @@ filterData (int decimFactor, int isSmooth, Matrix * const input, Matrix *decimOu
|
|
|
|
|
|
float *filter;
|
|
|
int filterlength = 0;
|
|
|
- readFilterFromFile (isSmooth, decimFactor, filter, &filterlength);
|
|
|
+ readFilterFromFile (isSmooth, decimFactor, &filter, &filterlength);
|
|
|
printf("%f\n", filter[0]);
|
|
|
|
|
|
int length = input->width * input->height;
|