forked from old/legacy-imlib2
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:
parent
c061b76b93
commit
81a9725218
|
@ -450,9 +450,14 @@ load(ImlibImage * im, ImlibProgressFunction progress,
|
||||||
if (((per - pper) >= progress_granularity)
|
if (((per - pper) >= progress_granularity)
|
||||||
|| (y == (im->h - 1)))
|
|| (y == (im->h - 1)))
|
||||||
{
|
{
|
||||||
l = y - pl;
|
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)
|
if (data)
|
||||||
free(data);
|
free(data);
|
||||||
fclose(f);
|
fclose(f);
|
||||||
|
@ -577,9 +582,12 @@ load(ImlibImage * im, ImlibProgressFunction progress,
|
||||||
if (((per - pper) >= progress_granularity)
|
if (((per - pper) >= progress_granularity)
|
||||||
|| (y == (im->h - 1)))
|
|| (y == (im->h - 1)))
|
||||||
{
|
{
|
||||||
l = y - pl;
|
/* fix off by one in case of the last line */
|
||||||
if (!progress(im, per, 0, (y - l), im->w, l))
|
if (y == (im->h -1))
|
||||||
{
|
l++;
|
||||||
|
|
||||||
|
if (!progress(im, per, 0, pl, im->w, l))
|
||||||
|
{
|
||||||
if (data)
|
if (data)
|
||||||
free(data);
|
free(data);
|
||||||
fclose(f);
|
fclose(f);
|
||||||
|
@ -640,9 +648,12 @@ load(ImlibImage * im, ImlibProgressFunction progress,
|
||||||
if (((per - pper) >= progress_granularity)
|
if (((per - pper) >= progress_granularity)
|
||||||
|| (y == (im->h - 1)))
|
|| (y == (im->h - 1)))
|
||||||
{
|
{
|
||||||
l = y - pl;
|
/* fix off by one in case of the last line */
|
||||||
if (!progress(im, per, 0, (y - l), im->w, l))
|
if (y == (im->h -1))
|
||||||
{
|
l++;
|
||||||
|
|
||||||
|
if (!progress(im, per, 0, pl, im->w, l))
|
||||||
|
{
|
||||||
if (data)
|
if (data)
|
||||||
free(data);
|
free(data);
|
||||||
fclose(f);
|
fclose(f);
|
||||||
|
|
Loading…
Reference in New Issue