Compare commits

..

No commits in common. "255cd1a36ba685f6278680d226faf46fc2d83ec2" and "4e37ac0a5e5a09c521664cde97240a622c4a5f48" have entirely different histories.

View File

@ -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,8 +55,7 @@ GrayScaleImageSeries *readImages(const char *path)
}
else
{
fclose(readSource);
return NULL;
series = NULL;
}
fclose(readSource);
@ -84,9 +83,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++)
@ -96,11 +95,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;
}