Verbesserungen an der großen Funktion
This commit is contained in:
parent
caaf6b402f
commit
d73f9ec750
@ -13,7 +13,7 @@ static int checkDimensions(unsigned int width, unsigned int height){
|
|||||||
|
|
||||||
int ok = 0;
|
int ok = 0;
|
||||||
|
|
||||||
if(width == 10 && height == 10)
|
if(width > 0 && height > 0)
|
||||||
return ok = 1;
|
return ok = 1;
|
||||||
|
|
||||||
else
|
else
|
||||||
@ -101,6 +101,8 @@ GrayScaleImageSeries *readImages(const char *path)
|
|||||||
free(series);
|
free(series);
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
series -> images[i].buffer = malloc(width * height);
|
||||||
}
|
}
|
||||||
|
|
||||||
for(int i = 0; i < numImages; i++)
|
for(int i = 0; i < numImages; i++)
|
||||||
@ -109,11 +111,11 @@ GrayScaleImageSeries *readImages(const char *path)
|
|||||||
series -> images[i].width = width;
|
series -> images[i].width = width;
|
||||||
series -> images[i].height = height;
|
series -> images[i].height = height;
|
||||||
|
|
||||||
fread(series -> images[i].buffer, width * height, 1, fp);
|
|
||||||
|
|
||||||
if(fread(series -> images[i].buffer, width * height, 1, fp) != (width * height))
|
if(fread(series -> images[i].buffer, width * height, 1, fp) != (width * height))
|
||||||
{
|
{
|
||||||
clearSeries(series);
|
clearSeries(series);
|
||||||
|
fclose(fp);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user