Finished testing, no more Failures in imageInputTests

imageInput.c

@@ -6,8 +6,6 @@
 #define BUFFER_SIZE 100
 #define FILE_HEADER_STRING "__info2_image_file_format__"
 
-// TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
-
 int checkString (FILE *file){ //Checks if String at the start of File equals expected Format (0 for wrong 1 for right)
 	if (file == NULL){ //returns 0 for empty file
 		return 0;
@@ -30,78 +28,105 @@ int checkString (FILE *file){ //Checks if String at the start of File equals exp
 	}	
 }
 
-void setParameters(FILE* file, unsigned int* imageCount, unsigned int* width, unsigned int* height);
+static void setParameters(FILE* file, unsigned int* imageCount, unsigned int* width, unsigned int* height);
-void allocateMemory(GrayScaleImageSeries *s, const int imageCount, const int width, const int height);
+static int allocateMemory(GrayScaleImageSeries *series, const int imageCount, const int width, const int height);
-// TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
+
+
 GrayScaleImageSeries *readImages(const char *path)
 {
 	FILE* file = fopen(path, "rb");
-	// TODO open binary file from file name
+    if(!(checkString(file))){
-    GrayScaleImageSeries *series = malloc(sizeof(GrayScaleImageSeries));
+        fclose(file);
-	GrayScaleImage *image = malloc(sizeof(GrayScaleImage));
-	series->images = image;
-	if(!(checkString(file)))
 		return NULL;
+    }
 
-    unsigned int* imageCount = &(series->count); // sets a pointer for int variable count in struct
+    unsigned int width, height; //uninitialised Variables, will be set by setparamters
-	printf("%d", *imageCount);
-	unsigned int* width = &(series->images->width);
-	//printf("%d", *width);
-    setParameters(file, imageCount, width, &(series->images->height));
-	printf("BP3\n");
-    allocateMemory(series, *imageCount, series->images->width, series->images->height);
-	printf("BP4\n");
-	//allocateMemoryLabels();
-	for(int i = (series->images->width * series->images->height) - 1; i >= 0; i--)
-	{
-		fread(&(series->images->buffer[i]), sizeof(GrayScalePixelType), 1, file);
 
+
+    GrayScaleImageSeries *series = malloc(sizeof(GrayScaleImageSeries)); //Reserving memory for series
+
+    setParameters(file, &(series->count), &width, &height); //setting parameters taken from image file
+
+    if(!allocateMemory(series, series->count, width, height)){
+        clearSeries(series); //If Memory couldnt be correctly allocated a clearing is necessary
+        fclose(file);
+        return NULL;
+    }
+
+
+
+    //Getting image data
+	for(unsigned int i = 0; i < series->count ; i++){ //Iterating for every image
+        for(unsigned int j = 0; j < width * height; j++){ //Iterating for every pixel
+		fread(&(series->images[i].buffer[j]), sizeof(GrayScalePixelType), 1, file);
+        }
+        fread(&(series->labels[i]), sizeof(unsigned char), 1, file); // TODO Added writing in labels array
 	}
 	fclose(file);
-	printf("BP5\n");
     return series;
 }
 
-// TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
 void clearSeries(GrayScaleImageSeries *series)
 {
-	for(size_t i = series->count - 1; i >= 0; i--)
+    if (!series)
+        return;
+
+    //Freeing Pixelbuffer for every image
+	for(unsigned int i = 0; i < series->count; i++)
 	{
-		free(series->images+series->count*sizeof(GrayScaleImage)*i);
+		free(series->images[i].buffer);
-		free(series->labels+series->count*sizeof(unsigned char)*i);
 	}
-	series->images = NULL;
+    free(series->images); //Freeing Images array
-	series->labels = NULL;
 
-	free(series);
+    free(series->labels); //Freeing Labels
+    free(series); //Freeing Main Structure
 
-	series = NULL;
 }
-void setParameters(FILE* file, unsigned int* imageCount, unsigned int* width, unsigned int* height) { // sets the parameters
+static void setParameters(FILE* file, unsigned int* imageCount, unsigned int* width, unsigned int* height) { // sets the parameters
-	printf("BP1");
+
-	char buffer[3];
+	unsigned short buffer[3];
 
 	fseek(file, 27, SEEK_SET);
-	fread(buffer, 1, 3, file);
+    if(fread(buffer, sizeof(unsigned short), 3, file) != 3){ // TODO changed some stuff here, used UNSIGNED SHORT instead of UNSIGNED CHAR!!
+        *imageCount = 0;
+        *width = 0;
+        *height = 0;
+        return;
+    } //Stops if file is too short and clean up
 
-	*imageCount = (int) buffer[0];
+	*imageCount = (unsigned int) buffer[0];
 
+    *width = (unsigned int) buffer[1];
 
-    *width = (int) buffer[1];
+    *height = (unsigned int) buffer[2];
-
-    *height = (int) buffer[2];
-	printf("BP2\n");
-	printf("%d\n", *imageCount);
-printf("%d\n", *width);
-printf("%d\n", *height);
-	// TODO allocate memory for labels array (in imageInput.h) -> Done in allocate Memory
-	
-	// TODO read from file and write in 2d arry, write label in labels array, repeat for imageCount	-> done in readImages	
 }
-// change this to createMatrix?
+
-void allocateMemory(GrayScaleImageSeries* s, const int imageCount, const int width, const int height) {
+static int allocateMemory(GrayScaleImageSeries *series, const int imageCount, const int width, const int height) {
-	for (int i = 0; i < imageCount; i++) {
+    series->count = imageCount; //counts number of images in series
-		s->images[i].buffer = (unsigned char *) malloc(width * height * sizeof(unsigned char)); // allocates memory for every image in the series
+
-		s->labels = malloc(width * height * sizeof(unsigned char));
+    series->images = malloc (sizeof(GrayScaleImage) * imageCount); //Reserving Memory for Images Array
+    if (series->images == NULL)
+        return 0;
+
+
+    series->labels = malloc (series->count * sizeof(unsigned char)); //One Label for every Image
+    if (series->labels == NULL){
+        return 0;}
+
+	for (int i = 0; i < imageCount; i++) { //Reserving Memory for every Images Pixelbuffer and setting width and height
+	    series->images[i].width = width;
+        series->images[i].height = height;
+
+        series->images[i].buffer =  malloc(width * height * sizeof(unsigned char)); // allocates memory for every image in the series
+        if (series->images[i].buffer == NULL){
+            for (int j = 0; j < i; j++){
+                free(series->images[j].buffer);
+                }
+            free(series->images);
+            free(series->labels);
+            return 0;
+        }
+
 	}
+    return 1;
 }

imageInputTests.c

@@ -39,12 +39,16 @@ static void prepareImageFile(const char *path, unsigned short int width, unsigne
 void test_readImagesReturnsCorrectNumberOfImages(void)
 {
     GrayScaleImageSeries *series = NULL;
+
     const unsigned short expectedNumberOfImages = 2;
     const char *path = "testFile.info2";
     prepareImageFile(path, 8, 8, expectedNumberOfImages, 1);
+
     series = readImages(path);
+
     TEST_ASSERT_NOT_NULL(series);
     TEST_ASSERT_EQUAL_UINT16(expectedNumberOfImages, series->count);
+
     clearSeries(series);
     remove(path);
 }