imageInput.c

@@ -29,24 +29,11 @@ int checkString (FILE *file){ //Checks if String at the start of File equals exp
 }
 }
 
-void setParameters(const char buffer[], unsigned int* imageCount, unsigned int* width, unsigned int* height);
-void allocateMemory(GrayScaleImageSeries *s, 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)
 {
     GrayScaleImageSeries *series = NULL;
-
-	// hier Niko Stuff
-    // create char array buffer with bytes containing initialization information
-    // TODO some kind of logic to get correct address in binary file
-    char initBuffer[3];
-    /*
-	int readBytes = fread(initBuffer, 1, 3, //file);
-     */
-    unsigned int* imageCount = &(series->count); // sets a pointer for int variable count in struct
-    setParameters(initBuffer, imageCount, &(series->images->width), &(series->images->height));
-    allocateMemory(series, *imageCount, series->images->width, series->images->height);
-
+    
     return series;
 }
 
@@ -60,15 +47,4 @@ void clearSeries(GrayScaleImageSeries *series)
 	}
 	series->images = NULL;
 	series->labels = NULL;
-}
-void setParameters(const char buffer[], unsigned int* imageCount, unsigned int* width, unsigned int* height) { // sets the parameters
-	*imageCount = (int) buffer[0];
-    *width = (int) buffer[1];
-    *height = (int) buffer[2];
-}
-// change this to createMatrix?
-void allocateMemory(GrayScaleImageSeries* s, const int imageCount, const int width, const int height) {
-	for (int i = 0; i < imageCount; i++) {
-		s->images[i].buffer = (unsigned char *) malloc(width * height * sizeof(unsigned char)); // allocates memory for every image in the series
-	}
 }