generated from freudenreichan/info2Praktikum-NeuronalesNetz
fixes
This commit is contained in:
1 parent
65bbc33d57
commit
b74473198a
1 file changed
+104
-50
+104
-50
@@ -6,89 +6,143 @@
|
|||||||
#define BUFFER_SIZE 100
|
#define BUFFER_SIZE 100
|
||||||
#define FILE_HEADER_STRING "__info2_image_file_format__"
|
#define FILE_HEADER_STRING "__info2_image_file_format__"
|
||||||
|
|
||||||
// TODO Implementieren Sie geeignete Hilfsfunktionen für das Lesen der Bildserie aus einer Datei
|
// Liest den Identifikationstag am Dateianfang und vergleicht ihn mit FILE_HEADER_STRING
|
||||||
|
static int checkFileHeader(FILE *file)
|
||||||
|
{
|
||||||
|
int isValid = 0;
|
||||||
|
size_t fileHeaderLen = strlen(FILE_HEADER_STRING);
|
||||||
|
char buffer[BUFFER_SIZE] = {0};
|
||||||
|
|
||||||
|
if(fileHeaderLen > BUFFER_SIZE-1)
|
||||||
|
fileHeaderLen = BUFFER_SIZE-1;
|
||||||
|
|
||||||
|
if(fread(buffer, sizeof(char), fileHeaderLen, file) == fileHeaderLen)
|
||||||
|
isValid = strcmp(buffer, FILE_HEADER_STRING) == 0;
|
||||||
|
|
||||||
|
return isValid;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Liest den naechsten unsigned short (Anzahl, Breite bzw. Hoehe); 0 im Fehlerfall.
|
||||||
|
// Kein fseek noetig: fread setzt den Dateizeiger automatisch hinter die gelesenen Bytes.
|
||||||
|
static unsigned short readUnsignedShort(FILE *file)
|
||||||
|
{
|
||||||
|
unsigned short value = 0;
|
||||||
|
|
||||||
|
if(fread(&value, sizeof(unsigned short), 1, file) != 1)
|
||||||
|
value = 0;
|
||||||
|
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
static unsigned short readNumberOfImages(FILE *file)
|
static unsigned short readNumberOfImages(FILE *file)
|
||||||
{
|
{
|
||||||
unsigned short numberOfImages = 0;
|
return readUnsignedShort(file);
|
||||||
fseek(file, strlen(FILE_HEADER_STRING), SEEK_SET);
|
|
||||||
fread(&numberOfImages, sizeof(unsigned short), 1, file);
|
|
||||||
return numberOfImages;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned short readImageWidth(FILE *file)
|
static unsigned short readImageWidth(FILE *file)
|
||||||
{
|
{
|
||||||
unsigned short ImageWidth = 0;
|
return readUnsignedShort(file);
|
||||||
fseek(file, sizeof(unsigned short), SEEK_CUR);
|
|
||||||
fread(&ImageWidth, sizeof(unsigned short), 1, file);
|
|
||||||
|
|
||||||
return ImageWidth;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned short readImageHeight(FILE *file)
|
static unsigned short readImageHeight(FILE *file)
|
||||||
{
|
{
|
||||||
unsigned short ImageHeight = 0;
|
return readUnsignedShort(file);
|
||||||
fseek(file, sizeof(unsigned short), SEEK_CUR);
|
|
||||||
fread(&ImageHeight, sizeof(unsigned short), 1, file);
|
|
||||||
return ImageHeight;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static GrayScalePixelType *readImage(FILE *file, unsigned short ImageWidth, unsigned short ImageHeight)
|
// Liest die Pixel eines Bildes in einen neuen Puffer; NULL bei Speicher- oder Lesefehler
|
||||||
|
static GrayScalePixelType *readImage(FILE *file, unsigned short imageWidth, unsigned short imageHeight)
|
||||||
{
|
{
|
||||||
GrayScalePixelType *image = malloc(ImageHeight*ImageWidth*sizeof(GrayScalePixelType));
|
size_t numberOfPixels = (size_t)imageWidth * imageHeight;
|
||||||
fseek(file, sizeof(unsigned short), SEEK_CUR);
|
GrayScalePixelType *image = (GrayScalePixelType *)malloc(numberOfPixels * sizeof(GrayScalePixelType));
|
||||||
fread(image, sizeof(char), ImageHeight*ImageWidth, file);
|
|
||||||
return image;
|
|
||||||
|
|
||||||
}
|
if(image != NULL && fread(image, sizeof(GrayScalePixelType), numberOfPixels, file) != numberOfPixels)
|
||||||
|
|
||||||
static GrayScalePixelType readLabel(FILE *file)
|
|
||||||
{
|
|
||||||
unsigned char label;
|
|
||||||
fseek(file, sizeof(unsigned short), SEEK_CUR);
|
|
||||||
fread(&label, sizeof(unsigned char), 1, file);
|
|
||||||
return label;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// TODO Vervollständigen Sie die Funktion readImages unter Benutzung Ihrer Hilfsfunktionen
|
|
||||||
GrayScaleImageSeries *readImages(const char *path)
|
|
||||||
{
|
|
||||||
FILE *file = fopen(path, "rb");
|
|
||||||
if (file == NULL)
|
|
||||||
{
|
{
|
||||||
return NULL;
|
free(image);
|
||||||
|
image = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return image;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Liest das Label, das direkt auf die Pixel eines Bildes folgt; 0 bei Erfolg, sonst -1
|
||||||
|
static int readLabel(FILE *file, unsigned char *label)
|
||||||
|
{
|
||||||
|
return fread(label, sizeof(unsigned char), 1, file) == 1 ? 0 : -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Legt eine leere Serie fuer numberOfImages Bilder an (Bildpuffer werden spaeter von readImage geliefert)
|
||||||
|
static GrayScaleImageSeries *createSeries(unsigned short numberOfImages)
|
||||||
|
{
|
||||||
|
GrayScaleImageSeries *series = (GrayScaleImageSeries *)calloc(1, sizeof(GrayScaleImageSeries));
|
||||||
|
|
||||||
|
if(series != NULL)
|
||||||
|
{
|
||||||
|
// calloc: alle Bildpuffer starten als NULL, damit clearSeries jederzeit gefahrlos aufraeumen kann
|
||||||
|
series->images = (GrayScaleImage *)calloc(numberOfImages, sizeof(GrayScaleImage));
|
||||||
|
series->labels = (unsigned char *)calloc(numberOfImages, sizeof(unsigned char));
|
||||||
|
|
||||||
|
if(series->images == NULL || series->labels == NULL)
|
||||||
|
{
|
||||||
|
clearSeries(series);
|
||||||
|
series = NULL;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
series->count = numberOfImages;
|
||||||
|
}
|
||||||
|
|
||||||
|
return series;
|
||||||
|
}
|
||||||
|
|
||||||
|
GrayScaleImageSeries *readImages(const char *path)
|
||||||
|
{
|
||||||
|
GrayScaleImageSeries *series = NULL;
|
||||||
|
FILE *file = fopen(path, "rb");
|
||||||
|
|
||||||
|
if(file != NULL)
|
||||||
|
{
|
||||||
|
if(checkFileHeader(file))
|
||||||
|
{
|
||||||
unsigned short numberOfImages = readNumberOfImages(file);
|
unsigned short numberOfImages = readNumberOfImages(file);
|
||||||
unsigned short imageWidth = readImageWidth(file);
|
unsigned short imageWidth = readImageWidth(file);
|
||||||
unsigned short imageHeight = readImageHeight(file);
|
unsigned short imageHeight = readImageHeight(file);
|
||||||
|
|
||||||
GrayScaleImageSeries *series = malloc(sizeof(GrayScaleImageSeries));
|
if(numberOfImages > 0 && imageWidth > 0 && imageHeight > 0)
|
||||||
if(series == NULL)
|
series = createSeries(numberOfImages);
|
||||||
{
|
|
||||||
fclose(file);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
series->count = numberOfImages;
|
for(unsigned int i = 0; series != NULL && i < series->count; i++)
|
||||||
series->images = malloc(numberOfImages * sizeof(GrayScaleImage));
|
|
||||||
series->labels = malloc(numberOfImages * sizeof(unsigned char));
|
|
||||||
|
|
||||||
|
|
||||||
for(int i = 0; i < numberOfImages; i++)
|
|
||||||
{
|
{
|
||||||
series->images[i].width = imageWidth;
|
series->images[i].width = imageWidth;
|
||||||
series->images[i].height = imageHeight;
|
series->images[i].height = imageHeight;
|
||||||
series->images[i].buffer = readImage(file, imageWidth, imageHeight);
|
series->images[i].buffer = readImage(file, imageWidth, imageHeight);
|
||||||
series->labels[i] = readLabel(file);
|
|
||||||
|
if(series->images[i].buffer == NULL || readLabel(file, &series->labels[i]) != 0)
|
||||||
|
{
|
||||||
|
clearSeries(series);
|
||||||
|
series = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fclose(file);
|
fclose(file);
|
||||||
|
}
|
||||||
|
|
||||||
return series;
|
return series;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
|
|
||||||
void clearSeries(GrayScaleImageSeries *series)
|
void clearSeries(GrayScaleImageSeries *series)
|
||||||
{
|
{
|
||||||
|
if(series != NULL)
|
||||||
|
{
|
||||||
|
if(series->images != NULL)
|
||||||
|
{
|
||||||
|
for(unsigned int i = 0; i < series->count; i++)
|
||||||
|
{
|
||||||
|
free(series->images[i].buffer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
free(series->images);
|
||||||
|
free(series->labels);
|
||||||
|
free(series);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user