I2_NeuronalerAbsturz/Start_Mac/imageInput.c

@@ -5,30 +5,30 @@
 
 #define BUFFER_SIZE 100
 #define FILE_HEADER_STRING "__info2_image_file_format__"
+#define HEADER_STRING_LEN strlen(FILE_HEADER_STRING)
 
 // TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
 
 /* ---------------- Hilfsfunktionen ---------------- */
 
-static int readHeader(FILE *file, unsigned short *count, unsigned short *width, unsigned short *height)
+static int readHeader(FILE *file, unsigned int *count, unsigned int *width, unsigned int *height)
 {
-    unsigned short headerlength = strlen(FILE_HEADER_STRING);
+    char buffer[HEADER_STRING_LEN + 1];
-    char buffer[headerlength + 1];
+    if (fread(buffer, 1, HEADER_STRING_LEN, file) != HEADER_STRING_LEN)
-    if (fread(buffer, 1, headerlength, file) != headerlength)
         return 0;
 
-    buffer[headerlength] = '\0';
+    buffer[HEADER_STRING_LEN] = '\0';
 
     if (strcmp(buffer, FILE_HEADER_STRING) != 0)
         return 0;
 
-    if (fread(count, sizeof(unsigned short), 1, file) != 1)
+    if (fread(count, sizeof(unsigned int), 1, file) != 1)
         return 0;
 
-    if (fread(width, sizeof(unsigned short), 1, file) != 1)
+    if (fread(width, sizeof(unsigned int), 1, file) != 1)
         return 0;
 
-    if (fread(height, sizeof(unsigned short), 1, file) != 1)
+    if (fread(height, sizeof(unsigned int), 1, file) != 1)
         return 0;
 
     return 1;
@@ -48,46 +48,32 @@ static int readSingleImage(FILE *file, GrayScaleImage *image)
 // TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
 GrayScaleImageSeries *readImages(const char *path)
 {
+    GrayScaleImageSeries *series = NULL;
+    
     FILE *file = fopen(path, "rb");
     if (!file) 
         return NULL;
 
-    unsigned short count, width, height;
+    unsigned int count, w, h;
 
-    if (!readHeader(file, &count, &width, &height)) {
+    if (!readHeader(file, &count, &w, &h)) {
         fclose(file);
         return NULL;
     }
 
     GrayScaleImageSeries *series = malloc(sizeof(GrayScaleImageSeries));
     series->count = count;
-    series->images = malloc(count * sizeof(GrayScaleImage));
-    series->labels = malloc(count * sizeof(unsigned char));
 
-    if (!series || !series->images || !series->labels) 
+    series->images = malloc(count * sizeof(GrayScaleImage));
-    {
+
-        free(series->images);
+    series->labels = malloc(count * sizeof(unsigned char));
-        free(series->labels);
-        free(series);
-        fclose(file);
-        return NULL;
-    }
 
     for (unsigned int i = 0; i < count; i++)
     {
-        series->images[i].width = width;
+        series->images[i].width = w;
-        series->images[i].height = height;
+        series->images[i].height = h;
-        series->images[i].buffer = malloc(width * height * sizeof(GrayScalePixelType));
+        series->images[i].buffer = malloc(w * h * sizeof(GrayScalePixelType));
 
-        //malloc prüfen
-        if (!series->images[i].buffer) 
-        {
-            clearSeries(series);
-            fclose(file);
-            return NULL;
-        }
-
-        //Image einlesen + prüfen
         if (!readSingleImage(file, &series->images[i])) {
             fclose(file);
             clearSeries(series);
@@ -109,15 +95,4 @@ GrayScaleImageSeries *readImages(const char *path)
 // TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
 void clearSeries(GrayScaleImageSeries *series)
 {
-    if(series)
-    {
-        for(unsigned int i = 0; i < series->count; i++)
-        {
-            free(series->images[i].buffer);
-        }
-
-        free(series->images);
-        free(series->labels);
-        free(series);
-    }
 }

I2_NeuronalerAbsturz/Start_Mac/imageInputTests.c

@@ -54,7 +54,7 @@ void test_readImagesReturnsCorrectImageWidth(void)
     GrayScaleImageSeries *series = NULL;
     const unsigned short expectedWidth = 10;
     const char *path = "testFile.info2";
-    prepareImageFile(path, expectedWidth, 8,  2, 1);
+    prepareImageFile(path, 8, expectedWidth, 2, 1);
     series = readImages(path);
     TEST_ASSERT_NOT_NULL(series);
     TEST_ASSERT_NOT_NULL(series->images);
@@ -70,7 +70,7 @@ void test_readImagesReturnsCorrectImageHeight(void)
     GrayScaleImageSeries *series = NULL;
     const unsigned short expectedHeight = 10;
     const char *path = "testFile.info2";
-    prepareImageFile(path, 8,  expectedHeight, 2, 1);
+    prepareImageFile(path, expectedHeight, 8, 2, 1);
     series = readImages(path);
     TEST_ASSERT_NOT_NULL(series);
     TEST_ASSERT_NOT_NULL(series->images);