hofmannjo99187/Neuronalesnetz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: hofmannjo99187:255cd1a36ba685f6278680d226faf46fc2d83ec2
Branches Tags
hofmannjo99187:master
hofmannjo99187:branchjonas
hofmannjo99187:branchflorian
hofmannjo99187:branchjens
..
compare: hofmannjo99187:4e37ac0a5e5a09c521664cde97240a622c4a5f48
Branches Tags
hofmannjo99187:branchjonas
hofmannjo99187:master
hofmannjo99187:branchflorian
hofmannjo99187:branchjens

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

1 changed files with 14 additions and 15 deletions
Show Stats Expand all files Collapse all files

29
imageInput.c
View File

@ -29,20 +29,20 @@ GrayScaleImageSeries *readImages(const char *path)
if (readSource != NULL) if (readSource != NULL)
{ {
series = calloc (amountOfStatusInfoToRead, sizeof(GrayScaleImageSeries)); series = calloc(amountOfStatusInfoToRead, sizeof(GrayScaleImageSeries));
series->images = calloc (amountOfStatusInfoToRead, 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)
{ {
for (int i = 0; i < series->count; i++) 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++) for (int i = 0; i < series->count; i++)
@ -55,8 +55,7 @@ GrayScaleImageSeries *readImages(const char *path)
} }
else else
{ {
fclose(readSource); series = NULL;
return NULL;
} }
fclose(readSource); fclose(readSource);
@ -84,9 +83,9 @@ 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++)
@ -96,11 +95,11 @@ void clearSeries(GrayScaleImageSeries * series)
} }
free(series->labels); free(series->labels);
series->labels = NULL; series->labels = NULL;
free(series->images); free(series->images);
series->images = NULL; series->images = NULL;
free(series); free(series);
series = NULL; series = NULL;
} }