removed no longer old code that was uncommented
This commit is contained in:
parent
51a71ba61f
commit
e1c80bf60c
199
imageInput.c
199
imageInput.c
@ -24,76 +24,34 @@ GrayScaleImageSeries *readImages(const char *path)
|
||||
unsigned int expectedHeader = 0;
|
||||
char headerString[sizeof(FILE_HEADER_STRING)] = "";
|
||||
|
||||
//int widthbuffer = 0;
|
||||
//int heightbuffer = 0;
|
||||
|
||||
|
||||
readSource = fopen(path, "rb");
|
||||
|
||||
if (readSource != NULL)
|
||||
{
|
||||
|
||||
//Speicheralloziierung komplett umschreichen!!!!!
|
||||
// done Series reservieren mit größe einer grayscaleImageSeries
|
||||
// done initiales image für statusinfos
|
||||
// done series->labels reservieren mit zahl count und größe int
|
||||
// done für anzahl count series->images mit size of grayscaleImage
|
||||
// done für jedes image series->images[i].buffer mit zahl series->count *numberOfBytesToRead und size of unsigned Char
|
||||
|
||||
/*
|
||||
series = calloc(amountOfStatusInfoToRead, (3 * sizeof(unsigned int) + 3 * sizeof(headerString)));
|
||||
series->images = calloc(amountOfStatusInfoToRead, (2 * sizeof(unsigned int) + sizeof(headerString)));
|
||||
// */
|
||||
|
||||
series = calloc(amountOfStatusInfoToRead, sizeof(GrayScaleImageSeries));
|
||||
|
||||
series->images = calloc(1, sizeof(GrayScaleImage));
|
||||
|
||||
numberOfBytesToRead = readStatusInfo(readSource, series, headerString, sizeOfStausInfoElementsInBytes, amountOfStatusInfoToRead);
|
||||
|
||||
expectedHeader = checkHeaderString(headerString);
|
||||
|
||||
// printf("llu %llu\n", series->count * numberOfBytesToRead * sizeof(GrayScalePixelType));
|
||||
// printf("count %d\n", series->count);
|
||||
// series->images[0].buffer = calloc(((series->count) * numberOfBytesToRead), sizeof(GrayScalePixelType));
|
||||
series->images = realloc(series->images, series->count * sizeof(GrayScaleImage));
|
||||
series->labels = calloc((series->count), sizeof(&(series->labels)));
|
||||
|
||||
if (expectedHeader)
|
||||
{
|
||||
//widthbuffer = series->images->width;
|
||||
//heightbuffer = series->images->height;
|
||||
|
||||
// reallocate memory so that each image width can be saved seperately
|
||||
//series->images = realloc(series->images, (series->count * (2 * sizeof(unsigned int) + sizeof(headerString))));
|
||||
for (int i = 0; i < series->count; i++)
|
||||
{
|
||||
series->images[i].buffer = calloc(numberOfBytesToRead, sizeof(unsigned char));
|
||||
}
|
||||
|
||||
|
||||
//series->images->width = widthbuffer;
|
||||
//series->images->height = heightbuffer;
|
||||
|
||||
/*
|
||||
for (int i = 1; i < series->count; i++)
|
||||
{
|
||||
(series->images + i * sizeof(series->images)) = calloc(1, (2 * sizeof(unsigned int) + sizeof(headerString)));
|
||||
}
|
||||
*/
|
||||
|
||||
for (int i = 0; i < series->count; i++)
|
||||
{
|
||||
// printf("hier1! \n");
|
||||
series->images[i].width = series->images->width;
|
||||
// printf("hier2! \n");
|
||||
series->images[i].height = series->images->height;
|
||||
// printf("hier2! \n");
|
||||
}
|
||||
|
||||
readImagedata(readSource, series, numberOfBytesToRead);
|
||||
// printf("hier4! \n");
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -113,43 +71,30 @@ void clearSeries(GrayScaleImageSeries * series)
|
||||
{
|
||||
int i = 0;
|
||||
int j = 0;
|
||||
// /*
|
||||
// printf("Hier14!\n");
|
||||
|
||||
|
||||
for (i = 0; i < series->count; i++)
|
||||
{
|
||||
/*
|
||||
printf("Hier14.1\n");
|
||||
printf("width: %d, height: %d\n", series->images[i].width, series->images[i].height);
|
||||
// */
|
||||
// /*
|
||||
if (i >= 0)
|
||||
{
|
||||
for (j = 0; j < series->images[i].width * series->images[i].height; j++)
|
||||
{
|
||||
/*
|
||||
printf("Hier14.1.1\n");
|
||||
printf("j: %d\n", j);
|
||||
printf("buffer: %d\n", series->images[i].buffer[j]);
|
||||
// */
|
||||
series->images[i].buffer[j] = 0;
|
||||
}
|
||||
}
|
||||
// */
|
||||
// printf("Hier14.2\n");
|
||||
|
||||
series->labels[i] = 0;
|
||||
// printf("Hier14.3\n");
|
||||
series->images[i].width = 0;
|
||||
// printf("Hier14.4\n");
|
||||
series->images[i].height = 0;
|
||||
// printf("Hier 14.5\n");
|
||||
} // */
|
||||
// printf("Hier15\n");
|
||||
|
||||
}
|
||||
|
||||
for (i = 0; i < series->count; i++)
|
||||
{
|
||||
free(series->images[i].buffer);
|
||||
series->images[i].buffer = NULL;
|
||||
}
|
||||
// printf("Hier16\n");
|
||||
|
||||
free(series->labels);
|
||||
series->labels = NULL;
|
||||
free(series->images);
|
||||
@ -157,76 +102,6 @@ void clearSeries(GrayScaleImageSeries * series)
|
||||
free(series);
|
||||
series = NULL;
|
||||
|
||||
/*
|
||||
// Write NULL into all memory spaces
|
||||
|
||||
for (i = 0; i < series->count; i++)
|
||||
{
|
||||
for (j = 0; j < series->images[i].width * series->images[i].height; j++)
|
||||
{
|
||||
series->images[i].buffer[j] = 0;
|
||||
}
|
||||
|
||||
series->labels[i] = 0;
|
||||
series->images[i].width = 0;
|
||||
series->images[i].height = 0;
|
||||
}
|
||||
|
||||
// free all pointer
|
||||
for (i = 0; i < series->count; i++)
|
||||
{
|
||||
free(series->images[i].buffer);
|
||||
series->images[i].buffer = NULL;
|
||||
}
|
||||
|
||||
series->count = 0;
|
||||
|
||||
free(series->images);
|
||||
series->images = NULL;
|
||||
free(series->labels);
|
||||
series->labels = NULL;
|
||||
free(series);
|
||||
series = NULL;
|
||||
|
||||
printf("cleared\n");
|
||||
*/
|
||||
|
||||
/*
|
||||
// Write NULL into all memory spaces
|
||||
for (i = 0; i < ((series->count) * (series->images->width) * (series->images->height) / 4); i++)
|
||||
{
|
||||
*(series->images->buffer + i * 4 * (series->images->width) * (series->images->height)) = '\0';
|
||||
}
|
||||
|
||||
for (i = 1; i < series->count; i++)
|
||||
{
|
||||
free(series->images[i].buffer);
|
||||
series->images[i].buffer = NULL;
|
||||
}
|
||||
|
||||
for (i = 0; i < (series->count); i++)
|
||||
{
|
||||
*(series->labels + i) = '\0';
|
||||
}
|
||||
|
||||
series->count = 0;
|
||||
series->images->width = 0;
|
||||
series->images->height = 0;
|
||||
series->images = 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;
|
||||
*/
|
||||
}
|
||||
|
||||
|
||||
@ -255,64 +130,8 @@ void readImagedata(FILE *const source, GrayScaleImageSeries *const series, int c
|
||||
|
||||
for (i = 0; i < series->count ; i++)
|
||||
{
|
||||
// int numbreadbuffer = 0;
|
||||
// int numbreadlabel = 0;
|
||||
// labelbuffer = 0;
|
||||
// printf("amount11 %d\n", amountToRead);
|
||||
// gedanke: &(series->images[i].buffer)
|
||||
// geht: &(series->images->buffer[0]) +i*36)
|
||||
// geht nicht: &series->images[i].buffer
|
||||
// printf("amountToRead: %d\n", amountToRead);
|
||||
/* numbreadbuffer = */ fread(&series->images[i].buffer[0], 1, amountToRead, source);
|
||||
|
||||
// /*
|
||||
if (feof(source))
|
||||
{
|
||||
printf("EOF!! buffer\n");
|
||||
}
|
||||
if (ferror(source))
|
||||
{
|
||||
printf("ERROR!!! buffer\n");
|
||||
}
|
||||
// */
|
||||
|
||||
/* numbreadlabel = */ fread(&series->labels[i], sizeof(*series->images->buffer), sizeof(*series->labels), source);
|
||||
// /*
|
||||
if (feof(source))
|
||||
{
|
||||
printf("EOF!!\n label");
|
||||
}
|
||||
if (ferror(source))
|
||||
{
|
||||
printf("ERROR!!! label\n");
|
||||
}
|
||||
// */
|
||||
/*
|
||||
printf("numbreadbuffer: %d\n", numbreadbuffer);
|
||||
printf("numbreadlabel: %d\n", numbreadlabel);
|
||||
|
||||
printf("label %d: %d\n", i, series->labels[i]);
|
||||
// */
|
||||
// fread(&(series->labels[i]), sizeof(*series->images->buffer), sizeof(*series->labels), source);
|
||||
|
||||
|
||||
// print complete imagebuffer
|
||||
/*
|
||||
int k = 0;
|
||||
for (int j = 0; j < amountToRead; j++)
|
||||
{
|
||||
printf("%x", series->images[i].buffer[j]);
|
||||
k++;
|
||||
if (k >= 9)
|
||||
{
|
||||
printf("\n");
|
||||
k = 0;
|
||||
}
|
||||
|
||||
}
|
||||
printf("\n");
|
||||
// */
|
||||
|
||||
fread(&series->images[i].buffer[0], 1, amountToRead, source);
|
||||
fread(&series->labels[i], sizeof(*series->images->buffer), sizeof(*series->labels), source);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user