From cfe95a6221126bee8dd596edf757de07ae93997d Mon Sep 17 00:00:00 2001 From: ChristophFischer Date: Thu, 5 Nov 2026 14:59:52 +0100 Subject: [PATCH] merge matrix.c --- Startcode/matrix.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Startcode/matrix.c b/Startcode/matrix.c index 5a43288..0ce51fb 100644 --- a/Startcode/matrix.c +++ b/Startcode/matrix.c @@ -6,19 +6,6 @@ Matrix createMatrix(unsigned int rows, unsigned int cols) { -<<<<<<< HEAD - struct Matrix m; - m.buffer = calloc(rows*cols, sizeof(MatrixType)); - m.rows = rows; - m.cols = cols; - - if( rows <= 0 || cols <= 0) - { - m.rows = 0; - m.cols = 0; - } - return m; -======= Matrix m; if (rows == 0 || cols == 0) //Ueberprüfen, ob ungültige Werte für Matrix vorhanden @@ -34,7 +21,6 @@ Matrix createMatrix(unsigned int rows, unsigned int cols) m.buffer = (MatrixType*)calloc(rows*cols, sizeof(MatrixType)); //Bei Fehlschalg gibt calloc entweder NULL oder Zeiger verschieden von NULL aus return m; ->>>>>>> b8adf7f0d66d424098983e650064e8c25353316f } void clearMatrix(Matrix *matrix)