Compare commits

..
Author SHA1 Message Date
rostni100585 1dd5d458e6 fixed some Error Messegas from matrixTests 2025-11-20 09:08:37 +01:00
2 changed files with 5 additions and 30 deletions

No files matched your search

+2 -26
View File
@@ -7,39 +7,15 @@
#define FILE_HEADER_STRING "__info2_image_file_format__"
// TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
void setParameters(const char buffer[], unsigned int* imageCount, int* width, 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(*imageCount, series->images->width, series->images->height);
return series;
}
void setParameters(const char buffer[], unsigned int* imageCount, int* width, int* height) { // sets the parameters
*imageCount = (int) buffer[0];
*width = (int) buffer[1];
*height = (int) buffer[2];
}
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
}
}
// TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
void clearSeries(GrayScaleImageSeries *series)
{
+3 -4
View File
@@ -23,8 +23,8 @@ Matrix createMatrix(unsigned int rows, unsigned int cols)
void clearMatrix(Matrix *matrix)
{
free(matrix.buffer);
matrix.buffer = NULL;
free(matrix->buffer);
matrix->buffer = NULL;
}
void setMatrixAt(MatrixType value, Matrix matrix, unsigned int rowIdx, unsigned int colIdx)
@@ -55,8 +55,7 @@ Matrix add(const Matrix matrix1, const Matrix matrix2)
Matrix MatrixErgebnis = createMatrix(matrix1.rows, matrix1.cols); //Creating Result Matrix
if(matrix1.cols != matrix2.cols || matrix1.rows != matrix2.rows){
printf("Matrix dimensions do not match\n"); //Error Message if dimensions of Input Matrixes are not identical
clearMatrix(MatrixErgebnis);
MatrixErgebnis = NULL;
clearMatrix(&MatrixErgebnis);
return MatrixErgebnis;
}
else{