19 Commits
Author SHA1 Message Date
hofmannjo99187 cddd141ea6 second test seems to be failing while trying to call *readImages() 2025-11-19 00:43:51 +01:00
hofmannjo99187 9d913f80f9 first test now working, second test causes programm to fail 2025-11-19 00:36:25 +01:00
hofmannjo99187 6189a5aa1e inconclusive debugging 2025-11-18 11:14:51 +01:00
hofmannjo99187 26073f77af Merge branch 'master' into branchjonas 2025-11-18 10:11:07 +01:00
hofmannjo99187 24b843fb77 testing 2025-11-18 10:07:09 +01:00
hofmannjo99187 6a2a5f7997 further testing 2025-11-18 08:59:40 +01:00
hofmannjo99187 6b039bf852 added testfile to repository 2025-11-18 07:18:12 +01:00
hofmannjo99187 f403d4ffa8 continued debugging 'readStatusInfo()' in 'imageInput.c' not yet working correctly, see comment 2025-11-18 00:22:57 +01:00
hofmannjo99187 a2c2aae0fb fixed errors that occured when building imageInputTests 2025-11-17 21:57:25 +01:00
hofmannjo99187 07012e5c35 matrixtest korigiert 2025-11-17 20:45:11 +01:00
hofmannjo99187 2057216df8 debugging 2025-11-13 23:37:38 +01:00
hofmannjo99187 f152305c4f created function readImagedata 2025-11-13 08:52:39 +01:00
hofmannjo99187 f68e92f429 created support-Function 'readStatusInfo' 2025-11-13 01:44:47 +01:00
hofmannjo99187 12359f3ac5 created support-Function 'readStatusInfo' 2025-11-13 01:43:59 +01:00
hofmannjo99187 3ca24ebdb7 added comment in imageInput.c 2025-11-11 22:58:10 +01:00
hofmannjo99187 e3d9f2d741 first version of clearSeries written 2025-11-11 22:52:36 +01:00
hofmannjo99187 d17f495f98 erste version von readImages geschrieben 2025-11-11 19:38:29 +01:00
hofmannjo99187 49f7de9dc1 Merge branch 'master' into branchjonas 2025-11-11 16:57:01 +01:00
hofmannjo99187 580e8d4296 pseudocode zum imageInput erstellt 2025-11-11 11:13:42 +01:00
+135 -1
View File
@@ -6,17 +6,151 @@
#define BUFFER_SIZE 100
#define FILE_HEADER_STRING "__info2_image_file_format__"
// Funktionen müssen noch auf Teilfunktionen
// übersichtlich aufgeteilt werden!
// TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
//void setupMemory();
unsigned int readStatusInfo(FILE *source, char *const headerString, unsigned int *const imageCount, unsigned int *const imageWidth, unsigned int *const imageHeight, int const amountToRead);
void readImagedata(FILE *source, unsigned char *const imageBuffer, unsigned char *const labelBuffer,int const imageCount ,int const amountToRead);
// TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
GrayScaleImageSeries *readImages(const char *path)
{
GrayScaleImageSeries *series = NULL;
// selbst geschriebene Variablen
FILE *readSource;
unsigned int numberOfBytesToRead = 0;
const unsigned int amountOfStatusInfoToRead = 1;
char headerString[sizeof("__info2_image_file_format__\0")] = "";
/*
char curChar = 0;
int i = 0;
*/
// dieses print(hier) wird nur einmal aufgerufen,
// der zweite test schafft es also nicht readImages
// korrekt aufzurufen!!!!!
printf("hier\n");
readSource = fopen(path, "rb");
if (readSource != NULL)
{
/*
// print entire source char by char
do
{
curChar = fgetc(readSource);
printf("%x ", curChar);
if (i >= 9)
{
printf("\n");
i = 0;
}
i++;
} while (curChar != EOF);
// print entire source char by char
*/
series = calloc(sizeof(unsigned int) + 3* sizeof(headerString), amountOfStatusInfoToRead);
series->images = calloc(2*sizeof(unsigned int) + sizeof(headerString), amountOfStatusInfoToRead);
numberOfBytesToRead = readStatusInfo(readSource, headerString, &(series->count), &(series->images->width), &(series->images->height), amountOfStatusInfoToRead);
series->images->buffer = calloc((series->count) * numberOfBytesToRead, sizeof(GrayScalePixelType));
series->labels = calloc((series->count), sizeof(&(series->labels)));
readImagedata(readSource, series->images->buffer, series->labels, series->count, numberOfBytesToRead);
}
fclose(readSource);
return series;
}
// TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
void clearSeries(GrayScaleImageSeries *series)
{
int i = 0;
// Write NULL into all memory spaces
for (i = 0; i < ((series->count) * (series->images->width) * (series->images->height)); i++)
{
*(series->images->buffer + i * (series->images->width) * (series->images->height)) = '\0';
}
for (i = 0; i < (series->count); i++)
{
*(series->labels + i) = '\0';
}
series->count = 0;
series->images->width = 0;
series->images->height = 0;
// Closse all allocated memory
// AND write NULL into every pointer
// so they can't be accessed
free(series->images->buffer);
series->images->buffer = NULL;
free(series->labels);
series->labels = NULL;
free(series->images);
series->images = NULL;
free(series);
series = NULL;
}
// reads string, pictureCount, pictureWidth, pictureHight
unsigned int readStatusInfo(FILE *source, char *const headerString, unsigned int *const imageCount, unsigned int *const imageWidth, unsigned int *const imageHeight, int const amountToRead)
{
unsigned int bytesToRead = 0;
/*
int numred = 0;
int numred2 = 0;
int numred3 = 0;
int numred4 = 0;
*/
//unsigned int imageCountBuffer = 0;
fread(headerString, 27, 1, source);
fread(imageCount, 2, 1, source);
fread(imageWidth, 2, 1, source);
fread(imageHeight, 2, 1, source);
bytesToRead = (*imageWidth) * (*imageHeight);
/*
printf("imgCntBuffer: %u\n", imageCountBuffer);
*imageCount = imageCountBuffer;
printf("numred: %d\n", numred);
printf("stringsize: %lld\n", sizeof("__info2_image_file_format__"));
printf("string: %send\n", headerString);
printf("numred2: %d\n", numred2);
printf("count: %u\n", *imageCount);
printf("numred3: %d\n", numred3);
printf("width: %u\n", *imageWidth);
printf("numred4: %d\n", numred4);
printf("height %u\n", *imageHeight);
printf("bytes to read = %u\n", bytesToRead);
*/
return bytesToRead;
}
// reads the imagebytes and the label of all images
void readImagedata(FILE *source, unsigned char *const imageBuffer, unsigned char *const labelBuffer,int const imageCount , int const amountOfBytes)
{
int i = 0;
for (i = 0; i <= imageCount; i++)
{
fread((imageBuffer + i * amountOfBytes), sizeof(&(imageBuffer)), amountOfBytes, source);
fread((labelBuffer + i), sizeof(&(labelBuffer)), 1, source);
}
}