schöne Version
This commit is contained in:
parent
d30596939a
commit
c064566efd
16
imageInput.c
16
imageInput.c
@ -12,11 +12,10 @@ GrayScaleImageSeries *readImages(const char *path)
|
||||
{
|
||||
// Initialisiert einen Zeiger zur struct und reserviert Speicherplatz
|
||||
GrayScaleImageSeries *series = malloc(sizeof(GrayScaleImageSeries));
|
||||
/*if(series == NULL){
|
||||
if(series == NULL){
|
||||
printf("Es ist nicht genügend Speicher übrig");
|
||||
return NULL;
|
||||
}*/
|
||||
allocation_test(series);
|
||||
}
|
||||
|
||||
FILE * data = fopen(path, "rb");
|
||||
if (data == NULL){
|
||||
@ -48,7 +47,7 @@ GrayScaleImageSeries *readImages(const char *path)
|
||||
fread(&height, sizeof(unsigned short), 1, data);
|
||||
|
||||
//reserviert Speicher für die Labels, die aber erst nach jedem Bild eingelesen werden
|
||||
series->labels = malloc(sizeof(unsigned char)* series->count);
|
||||
series->labels = malloc(sizeof(unsigned char) * series->count);
|
||||
if (series->labels == NULL){
|
||||
printf("Es ist nicht genügend Speicher übrig");
|
||||
free(series->images);
|
||||
@ -62,10 +61,10 @@ GrayScaleImageSeries *readImages(const char *path)
|
||||
// für jedes Bild muss vorher eine Größe festgelegt werden, die jedoch in diesem Fall immer gleich ist
|
||||
series->images[counter_picture].width = width;
|
||||
series->images[counter_picture].height =height;
|
||||
unsigned int size_picture =(height)* (width);
|
||||
unsigned int size_picture = height * width;
|
||||
|
||||
//reservieren des Speichers für Buffer, der die einzelnen Pixels speichert
|
||||
series->images[counter_picture].buffer = (GrayScalePixelType*)malloc(size_picture* sizeof(GrayScalePixelType));
|
||||
series->images[counter_picture].buffer = malloc(size_picture* sizeof(GrayScalePixelType));
|
||||
if (series->images[counter_picture].buffer == NULL){
|
||||
printf("Es ist nicht genügend Speicher übrig");
|
||||
free(series->images);
|
||||
@ -77,7 +76,7 @@ GrayScaleImageSeries *readImages(const char *path)
|
||||
//einlesen der einzelnen Pixel in buffer
|
||||
for(int counter_pixels = 0; counter_pixels < size_picture; counter_pixels++){
|
||||
fread(&series->images[counter_picture].buffer[counter_pixels], sizeof(unsigned char), 1, data);
|
||||
}
|
||||
}
|
||||
|
||||
//einlesen der Labels
|
||||
fread(&series->labels[counter_picture], sizeof(unsigned char), 1, data);
|
||||
@ -91,10 +90,11 @@ GrayScaleImageSeries *readImages(const char *path)
|
||||
// TODO Vervollständigen Sie die Funktion clearSeries, welche eine Bildserie vollständig aus dem Speicher freigibt
|
||||
void clearSeries(GrayScaleImageSeries *series)
|
||||
{
|
||||
//erst den Speicherplatz der Pixel freigeben
|
||||
for(int number= 0; number < series->count; number++){
|
||||
free(series->images[number].buffer);
|
||||
}
|
||||
|
||||
// dann die Bilder freigeben
|
||||
free(series-> images);
|
||||
free(series);
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user