diff --git a/imageInput.c b/imageInput.c index d3a9a2a..0906f60 100644 --- a/imageInput.c +++ b/imageInput.c @@ -46,9 +46,9 @@ GrayScaleImageSeries *readImages(const char *path) return NULL; } unsigned short image_count, width, height; - fread(&image_count,1,sizeof(unsigned short),datei); - fread(&width,1,sizeof(unsigned short),datei); - fread(&height,1,sizeof(unsigned short),datei); + fread(&image_count,sizeof(unsigned short),1,datei); + fread(&width,sizeof(unsigned short),1,datei); + fread(&height,sizeof(unsigned short),1,datei); //printf("%u Bilder und %u mal %u",image_count,width,height); GrayScaleImageSeries *series = NULL; series = malloc(sizeof(GrayScaleImageSeries)); @@ -57,6 +57,8 @@ GrayScaleImageSeries *readImages(const char *path) series->labels = malloc(image_count*sizeof(unsigned char)); for(unsigned short i = 0;iimages[i].width = width; + series->images[i].height = height; series->images[i].buffer = malloc(width*height); } for(unsigned short i = 0;iimages); @@ -70,7 +70,7 @@ void test_readImagesReturnsCorrectImageHeight(void) GrayScaleImageSeries *series = NULL; const unsigned short expectedHeight = 10; const char *path = "testFile.info2"; - prepareImageFile(path, expectedHeight, 8, 2, 1); + prepareImageFile(path,8, expectedHeight, 2, 1); series = readImages(path); TEST_ASSERT_NOT_NULL(series); TEST_ASSERT_NOT_NULL(series->images); diff --git a/main.c b/main.c index 67316a0..6670e9f 100644 --- a/main.c +++ b/main.c @@ -1,3 +1,4 @@ + #include #include #include "imageInput.h" @@ -6,7 +7,7 @@ int main(int argc, char *argv[]) { - readImages("mnist_test.info2"); + //readImages("mnist_test.info2"); const unsigned int windowWidth = 800; const unsigned int windowHeight = 600; @@ -68,4 +69,4 @@ int main(int argc, char *argv[]) return exitCode; -} \ No newline at end of file +}