fix for the other binary versions in the pnm_loader. Could someone please

check if the ascii ones work right? I didnt test them. and test the binary
formats too while youre at it. Thanks :)


SVN revision: 4087
This commit is contained in:
Till Adam 2001-01-03 21:23:45 +00:00
parent c061b76b93
commit 81a9725218
1 changed files with 20 additions and 9 deletions

View File

@ -450,9 +450,14 @@ load(ImlibImage * im, ImlibProgressFunction progress,
if (((per - pper) >= progress_granularity)
|| (y == (im->h - 1)))
{
l = y - pl;
if (!progress(im, per, 0, (y - l), im->w, l))
{
l = y - pl;
/* fix off by one in case of the last line */
if (y == (im->h -1))
l++;
if (!progress(im, per, 0, pl, im->w, l))
{
if (data)
free(data);
fclose(f);
@ -577,9 +582,12 @@ load(ImlibImage * im, ImlibProgressFunction progress,
if (((per - pper) >= progress_granularity)
|| (y == (im->h - 1)))
{
l = y - pl;
if (!progress(im, per, 0, (y - l), im->w, l))
{
/* fix off by one in case of the last line */
if (y == (im->h -1))
l++;
if (!progress(im, per, 0, pl, im->w, l))
{
if (data)
free(data);
fclose(f);
@ -640,9 +648,12 @@ load(ImlibImage * im, ImlibProgressFunction progress,
if (((per - pper) >= progress_granularity)
|| (y == (im->h - 1)))
{
l = y - pl;
if (!progress(im, per, 0, (y - l), im->w, l))
{
/* fix off by one in case of the last line */
if (y == (im->h -1))
l++;
if (!progress(im, per, 0, pl, im->w, l))
{
if (data)
free(data);
fclose(f);