Preparation for the next workphase

imageInput.c

@@ -69,6 +69,9 @@ void setParameters(FILE* file, unsigned int* imageCount, unsigned int* width, un
 	*imageCount = (int) buffer[0];
     *width = (int) buffer[1];
     *height = (int) buffer[2];
+	// TODO allocate memory for labels array (in imageInput.h)
+
+	// TODO read from file and write in 2d arry, write label in labels array, repeat for imageCount
 }
 // change this to createMatrix?
 void allocateMemory(GrayScaleImageSeries* s, const int imageCount, const int width, const int height) {

matrix.c

@@ -8,12 +8,17 @@
 Matrix createMatrix(unsigned int rows, unsigned int cols)
 {
     Matrix newMatrix;
+	if (rows == 0 || cols == 0) {
+		newMatrix.rows = 0;
+		newMatrix.cols = 0;
+		newMatrix.buffer = NULL;
+		return newMatrix;
+	}
+
 	newMatrix.rows = rows;
 	newMatrix.cols = cols;
-	if (rows == 0 || cols == 0)
-		newMatrix.buffer = NULL;
-	else
-		newMatrix.buffer = calloc(rows*cols, sizeof(MatrixType));
+
+	newMatrix.buffer = calloc(rows*cols, sizeof(MatrixType));
 	return newMatrix;
 }
 
@@ -21,6 +26,8 @@ void clearMatrix(Matrix *matrix)
 {
     free(matrix->buffer);
 	matrix->buffer = NULL;
+	matrix->rows = 0;
+	matrix->cols = 0;
 }
 
 void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)