improved redability of imageInput.c
This commit is contained in:
parent
e1c80bf60c
commit
4e37ac0a5e
19
imageInput.c
19
imageInput.c
@ -29,14 +29,14 @@ GrayScaleImageSeries *readImages(const char *path)
|
|||||||
|
|
||||||
if (readSource != NULL)
|
if (readSource != NULL)
|
||||||
{
|
{
|
||||||
series = calloc(amountOfStatusInfoToRead, sizeof(GrayScaleImageSeries));
|
series = calloc(amountOfStatusInfoToRead, sizeof(GrayScaleImageSeries));
|
||||||
series->images = calloc(1, sizeof(GrayScaleImage));
|
series->images = calloc(amountOfStatusInfoToRead, sizeof(GrayScaleImage));
|
||||||
|
|
||||||
numberOfBytesToRead = readStatusInfo(readSource, series, headerString, sizeOfStausInfoElementsInBytes, amountOfStatusInfoToRead);
|
numberOfBytesToRead = readStatusInfo(readSource, series, headerString, sizeOfStausInfoElementsInBytes, amountOfStatusInfoToRead);
|
||||||
expectedHeader = checkHeaderString(headerString);
|
expectedHeader = checkHeaderString(headerString);
|
||||||
|
|
||||||
series->images = realloc(series->images, series->count * sizeof(GrayScaleImage));
|
series->images = realloc(series->images, series->count * sizeof(GrayScaleImage));
|
||||||
series->labels = calloc((series->count), sizeof(&(series->labels)));
|
series->labels = calloc((series->count), sizeof(&(series->labels)));
|
||||||
|
|
||||||
if (expectedHeader)
|
if (expectedHeader)
|
||||||
{
|
{
|
||||||
@ -86,7 +86,6 @@ void clearSeries(GrayScaleImageSeries * series)
|
|||||||
series->labels[i] = 0;
|
series->labels[i] = 0;
|
||||||
series->images[i].width = 0;
|
series->images[i].width = 0;
|
||||||
series->images[i].height = 0;
|
series->images[i].height = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < series->count; i++)
|
for (i = 0; i < series->count; i++)
|
||||||
@ -101,7 +100,6 @@ void clearSeries(GrayScaleImageSeries * series)
|
|||||||
series->images = NULL;
|
series->images = NULL;
|
||||||
free(series);
|
free(series);
|
||||||
series = NULL;
|
series = NULL;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -128,10 +126,11 @@ void readImagedata(FILE *const source, GrayScaleImageSeries *const series, int c
|
|||||||
{
|
{
|
||||||
int i = 0;
|
int i = 0;
|
||||||
|
|
||||||
|
|
||||||
for (i = 0; i < series->count ; i++)
|
for (i = 0; i < series->count ; i++)
|
||||||
{
|
{
|
||||||
fread(&series->images[i].buffer[0], 1, amountToRead, source);
|
fread(&series->images[i].buffer[0], sizeof(*series->images->buffer), amountToRead, source);
|
||||||
fread(&series->labels[i], sizeof(*series->images->buffer), sizeof(*series->labels), source);
|
fread(&series->labels[i], sizeof(*series->images->buffer), sizeof(*series->labels), source);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user