fixed clearSeries(), label test still not working
This commit is contained in:
parent
7698e94944
commit
4cb06d2951
39
imageInput.c
39
imageInput.c
@ -52,13 +52,13 @@ GrayScaleImageSeries *readImages(const char *path)
|
|||||||
numberOfBytesToRead = readStatusInfo(readSource, series, headerString, sizeOfStausInfoElementsInBytes, amountOfStatusInfoToRead);
|
numberOfBytesToRead = readStatusInfo(readSource, series, headerString, sizeOfStausInfoElementsInBytes, amountOfStatusInfoToRead);
|
||||||
|
|
||||||
expectedHeader = checkHeaderString(headerString);
|
expectedHeader = checkHeaderString(headerString);
|
||||||
|
|
||||||
// printf("llu %llu\n", series->count * numberOfBytesToRead * sizeof(GrayScalePixelType));
|
// printf("llu %llu\n", series->count * numberOfBytesToRead * sizeof(GrayScalePixelType));
|
||||||
// printf("count %d\n", series->count);
|
// printf("count %d\n", series->count);
|
||||||
// series->images[0].buffer = calloc(((series->count) * numberOfBytesToRead), sizeof(GrayScalePixelType));
|
// series->images[0].buffer = calloc(((series->count) * numberOfBytesToRead), sizeof(GrayScalePixelType));
|
||||||
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)
|
||||||
{
|
{
|
||||||
//widthbuffer = series->images->width;
|
//widthbuffer = series->images->width;
|
||||||
@ -102,7 +102,7 @@ GrayScaleImageSeries *readImages(const char *path)
|
|||||||
|
|
||||||
fclose(readSource);
|
fclose(readSource);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return series;
|
return series;
|
||||||
}
|
}
|
||||||
@ -113,26 +113,43 @@ void clearSeries(GrayScaleImageSeries * series)
|
|||||||
{
|
{
|
||||||
int i = 0;
|
int i = 0;
|
||||||
int j = 0;
|
int j = 0;
|
||||||
|
// /*
|
||||||
|
// printf("Hier14!\n");
|
||||||
for (i = 0; i < series->count; i++)
|
for (i = 0; i < series->count; i++)
|
||||||
{
|
{
|
||||||
for (j = 0; j < series->images[i].width * series->images[i].height; j++)
|
/*
|
||||||
|
printf("Hier14.1\n");
|
||||||
|
printf("width: %d, height: %d\n", series->images[i].width, series->images[i].height);
|
||||||
|
// */
|
||||||
|
// /*
|
||||||
|
if (i >= 1)
|
||||||
{
|
{
|
||||||
series->images[i].buffer[j] = 0;
|
for (j = 0; j < series->images[i].width * series->images[i].height; j++)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
printf("Hier14.1.1\n");
|
||||||
|
printf("j: %d\n", j);
|
||||||
|
printf("buffer: %d\n", series->images[i].buffer[j]);
|
||||||
|
// */
|
||||||
|
series->images[i].buffer[j] = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
// */
|
||||||
|
// printf("Hier14.2\n");
|
||||||
series->labels[i] = 0;
|
series->labels[i] = 0;
|
||||||
|
// printf("Hier14.3\n");
|
||||||
series->images[i].width = 0;
|
series->images[i].width = 0;
|
||||||
|
// printf("Hier14.4\n");
|
||||||
series->images[i].height = 0;
|
series->images[i].height = 0;
|
||||||
}
|
// printf("Hier 14.5\n");
|
||||||
|
} // */
|
||||||
|
// printf("Hier15\n");
|
||||||
for (i = 0; i < series->count; i++)
|
for (i = 0; i < series->count; i++)
|
||||||
{
|
{
|
||||||
free(series->images[i].buffer);
|
free(series->images[i].buffer);
|
||||||
series->images[i].buffer = NULL;
|
series->images[i].buffer = NULL;
|
||||||
}
|
}
|
||||||
|
// printf("Hier16\n");
|
||||||
free(series->labels);
|
free(series->labels);
|
||||||
series->labels = NULL;
|
series->labels = NULL;
|
||||||
free(series->images);
|
free(series->images);
|
||||||
|
|||||||
BIN
testFile.info2
BIN
testFile.info2
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user