Compare commits
2 Commits
4e37ac0a5e
...
255cd1a36b
| Author | SHA1 | Date | |
|---|---|---|---|
| 255cd1a36b | |||
| 868007ad49 |
29
imageInput.c
29
imageInput.c
@ -29,20 +29,20 @@ GrayScaleImageSeries *readImages(const char *path)
|
||||
|
||||
if (readSource != NULL)
|
||||
{
|
||||
series = calloc(amountOfStatusInfoToRead, sizeof(GrayScaleImageSeries));
|
||||
series->images = calloc(amountOfStatusInfoToRead, sizeof(GrayScaleImage));
|
||||
series = calloc (amountOfStatusInfoToRead, sizeof(GrayScaleImageSeries));
|
||||
series->images = calloc (amountOfStatusInfoToRead, sizeof(GrayScaleImage));
|
||||
|
||||
numberOfBytesToRead = readStatusInfo(readSource, series, headerString, sizeOfStausInfoElementsInBytes, amountOfStatusInfoToRead);
|
||||
expectedHeader = checkHeaderString(headerString);
|
||||
numberOfBytesToRead = readStatusInfo (readSource, series, headerString, sizeOfStausInfoElementsInBytes, amountOfStatusInfoToRead);
|
||||
expectedHeader = checkHeaderString (headerString);
|
||||
|
||||
series->images = realloc(series->images, series->count * sizeof(GrayScaleImage));
|
||||
series->labels = calloc((series->count), sizeof(&(series->labels)));
|
||||
series->images = realloc (series->images, series->count * sizeof(GrayScaleImage));
|
||||
series->labels = calloc (series->count, sizeof(&(series->labels)));
|
||||
|
||||
if (expectedHeader)
|
||||
{
|
||||
for (int i = 0; i < series->count; i++)
|
||||
{
|
||||
series->images[i].buffer = calloc(numberOfBytesToRead, sizeof(unsigned char));
|
||||
series->images[i].buffer = calloc(numberOfBytesToRead, sizeof(unsigned char));
|
||||
}
|
||||
|
||||
for (int i = 0; i < series->count; i++)
|
||||
@ -55,7 +55,8 @@ GrayScaleImageSeries *readImages(const char *path)
|
||||
}
|
||||
else
|
||||
{
|
||||
series = NULL;
|
||||
fclose(readSource);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
fclose(readSource);
|
||||
@ -83,9 +84,9 @@ void clearSeries(GrayScaleImageSeries * series)
|
||||
}
|
||||
}
|
||||
|
||||
series->labels[i] = 0;
|
||||
series->images[i].width = 0;
|
||||
series->images[i].height = 0;
|
||||
series->labels[i] = 0;
|
||||
series->images[i].width = 0;
|
||||
series->images[i].height = 0;
|
||||
}
|
||||
|
||||
for (i = 0; i < series->count; i++)
|
||||
@ -95,11 +96,11 @@ void clearSeries(GrayScaleImageSeries * series)
|
||||
}
|
||||
|
||||
free(series->labels);
|
||||
series->labels = NULL;
|
||||
series->labels = NULL;
|
||||
free(series->images);
|
||||
series->images = NULL;
|
||||
series->images = NULL;
|
||||
free(series);
|
||||
series = NULL;
|
||||
series = NULL;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user