diff --git a/imageInput.c b/imageInput.c index 7bdde14..2f49a0f 100644 --- a/imageInput.c +++ b/imageInput.c @@ -52,13 +52,13 @@ GrayScaleImageSeries *readImages(const char *path) numberOfBytesToRead = readStatusInfo(readSource, series, headerString, sizeOfStausInfoElementsInBytes, amountOfStatusInfoToRead); expectedHeader = checkHeaderString(headerString); - + // printf("llu %llu\n", series->count * numberOfBytesToRead * sizeof(GrayScalePixelType)); // printf("count %d\n", series->count); // series->images[0].buffer = calloc(((series->count) * numberOfBytesToRead), sizeof(GrayScalePixelType)); series->images = realloc(series->images, series->count * sizeof(GrayScaleImage)); series->labels = calloc((series->count), sizeof(&(series->labels))); - + if (expectedHeader) { //widthbuffer = series->images->width; @@ -102,7 +102,7 @@ GrayScaleImageSeries *readImages(const char *path) fclose(readSource); } - + return series; } @@ -113,26 +113,43 @@ void clearSeries(GrayScaleImageSeries * series) { int i = 0; int j = 0; - - + // /* + // printf("Hier14!\n"); 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; + // printf("Hier14.3\n"); series->images[i].width = 0; + // printf("Hier14.4\n"); series->images[i].height = 0; - } - + // printf("Hier 14.5\n"); + } // */ + // printf("Hier15\n"); for (i = 0; i < series->count; i++) { free(series->images[i].buffer); series->images[i].buffer = NULL; } - + // printf("Hier16\n"); free(series->labels); series->labels = NULL; free(series->images); diff --git a/testFile.info2 b/testFile.info2 deleted file mode 100644 index 86c028a..0000000 Binary files a/testFile.info2 and /dev/null differ