forked from old/legacy-imlib2
Thu Apr 27 04:22:06 GMT 2000
(gilbertt) Return 2 from interrupted loaders. SVN revision: 2552
This commit is contained in:
parent
d0356b162f
commit
2aa32f702e
|
@ -2891,3 +2891,10 @@ Thu Apr 27 04:00:28 GMT 2000
|
|||
All done except the tiff loader. This one is gonna be hard. Libtiff is quite
|
||||
broken in many ways ;-)
|
||||
|
||||
_______________________________________________
|
||||
|
||||
Thu Apr 27 04:22:06 GMT 2000
|
||||
(gilbertt)
|
||||
|
||||
Return 2 from interrupted loaders.
|
||||
|
||||
|
|
|
@ -100,7 +100,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
if(!progress(im, per, 0, (y - l), im->w, l))
|
||||
{
|
||||
fclose(f);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
pper = per;
|
||||
pl = y;
|
||||
|
@ -167,7 +167,7 @@ save (ImlibImage *im, ImlibProgressFunction progress,
|
|||
free(buf);
|
||||
#endif
|
||||
fclose(f);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
pper = per;
|
||||
pl = y;
|
||||
|
|
|
@ -305,7 +305,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
if(!progress(im, per, 0, im->h - y - 1, im->w, im->h - y + l))
|
||||
{
|
||||
free(buffer);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
pper = per;
|
||||
pl = y;
|
||||
|
@ -341,7 +341,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
if(!progress(im, per, 0, im->h - y - 1, im->w, im->h - y + l))
|
||||
{
|
||||
free(buffer);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
pper = per;
|
||||
pl = y;
|
||||
|
@ -433,7 +433,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
if(!progress(im, per, 0, im->h - y - 1, im->w, im->h - y + l))
|
||||
{
|
||||
free(buffer);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
pper = per;
|
||||
pl = y;
|
||||
|
@ -464,7 +464,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
if(!progress(im, per, 0, im->h - y - 1, im->w, im->h - y + l))
|
||||
{
|
||||
free(buffer);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
pper = per;
|
||||
pl = y;
|
||||
|
@ -497,7 +497,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
if(!progress(im, per, 0, im->h - y - 1, im->w, im->h - y + l))
|
||||
{
|
||||
free(buffer);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
pper = per;
|
||||
pl = y;
|
||||
|
@ -528,7 +528,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
if(!progress(im, per, 0, im->h - y - 1, im->w, im->h - y + l))
|
||||
{
|
||||
free(buffer);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
pper = per;
|
||||
pl = y;
|
||||
|
@ -561,7 +561,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
if(!progress(im, per, 0, im->h - y - 1, im->w, im->h - y + l))
|
||||
{
|
||||
free(buffer);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
pper = per;
|
||||
pl = y;
|
||||
|
|
|
@ -169,7 +169,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
jpeg_finish_decompress(&cinfo);
|
||||
jpeg_destroy_decompress(&cinfo);
|
||||
fclose(f);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
prevy = l + scans;
|
||||
}
|
||||
|
@ -214,7 +214,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
jpeg_finish_decompress(&cinfo);
|
||||
jpeg_destroy_decompress(&cinfo);
|
||||
fclose(f);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
prevy = l + scans;
|
||||
}
|
||||
|
@ -325,7 +325,7 @@ save (ImlibImage *im, ImlibProgressFunction progress,
|
|||
jpeg_finish_compress(&cinfo);
|
||||
free(buf);
|
||||
fclose(f);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
pper = per;
|
||||
pl = y;
|
||||
|
|
|
@ -203,7 +203,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
png_read_end(png_ptr, info_ptr);
|
||||
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
|
||||
fclose(f);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
free(line);
|
||||
|
@ -236,7 +236,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
png_read_end(png_ptr, info_ptr);
|
||||
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
|
||||
fclose(f);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
prevy = y + 1;
|
||||
}
|
||||
|
@ -247,7 +247,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
png_read_end(png_ptr, info_ptr);
|
||||
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
|
||||
fclose(f);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -359,7 +359,7 @@ save (ImlibImage *im, ImlibProgressFunction progress,
|
|||
png_write_end(png_ptr, info_ptr);
|
||||
png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
|
||||
fclose(f);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
pper = per;
|
||||
pl = y;
|
||||
|
|
|
@ -238,7 +238,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
if (data)
|
||||
free(data);
|
||||
fclose(f);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
pper = per;
|
||||
pl = y;
|
||||
|
@ -302,7 +302,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
if (data)
|
||||
free(data);
|
||||
fclose(f);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
pper = per;
|
||||
pl = y;
|
||||
|
@ -356,7 +356,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
if (data)
|
||||
free(data);
|
||||
fclose(f);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
pper = per;
|
||||
pl = y;
|
||||
|
@ -420,7 +420,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
if (data)
|
||||
free(data);
|
||||
fclose(f);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
pper = per;
|
||||
pl = y;
|
||||
|
@ -499,7 +499,7 @@ save (ImlibImage *im, ImlibProgressFunction progress,
|
|||
{
|
||||
free(buf);
|
||||
fclose(f);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
pper = per;
|
||||
pl = y;
|
||||
|
@ -548,7 +548,7 @@ save (ImlibImage *im, ImlibProgressFunction progress,
|
|||
{
|
||||
free(buf);
|
||||
fclose(f);
|
||||
return 1;
|
||||
return 2;
|
||||
}
|
||||
pper = per;
|
||||
pl = y;
|
||||
|
|
|
@ -206,7 +206,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
|
||||
if ((!rast) || (!im->data)) /* Error checking */
|
||||
{
|
||||
fprintf(stderr, "Out of memory\n");
|
||||
fprintf(stderr, "imlib2-tiffloader: Out of memory\n");
|
||||
|
||||
if (!rast)
|
||||
_TIFFfree(rast);
|
||||
|
@ -224,7 +224,7 @@ load (ImlibImage *im, ImlibProgressFunction progress,
|
|||
|
||||
if (rgba_image.rgba.put.any == NULL)
|
||||
{
|
||||
fprintf(stderr, "No put function");
|
||||
fprintf(stderr, "imlib2-tiffloader: No put function");
|
||||
|
||||
_TIFFfree(rast);
|
||||
free(im->data);
|
||||
|
|
Loading…
Reference in New Issue