forked from enlightenment/efl
parent
041327008f
commit
0cf81bc080
|
@ -266,7 +266,7 @@ evas_image_load_file_data_tiff(Image_Entry *ie, const char *file, const char *ke
|
||||||
|
|
||||||
if (!rast)
|
if (!rast)
|
||||||
{
|
{
|
||||||
ERROR("Evas Tiff loader: out of memory");
|
ERR("Evas Tiff loader: out of memory");
|
||||||
|
|
||||||
TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image);
|
TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image);
|
||||||
TIFFClose(tif);
|
TIFFClose(tif);
|
||||||
|
@ -276,7 +276,7 @@ evas_image_load_file_data_tiff(Image_Entry *ie, const char *file, const char *ke
|
||||||
|
|
||||||
if (rgba_image.rgba.put.any == NULL)
|
if (rgba_image.rgba.put.any == NULL)
|
||||||
{
|
{
|
||||||
ERROR("Evas Tiff loader: no put function");
|
ERR("Evas Tiff loader: no put function");
|
||||||
|
|
||||||
_TIFFfree(rast);
|
_TIFFfree(rast);
|
||||||
TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image);
|
TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image);
|
||||||
|
@ -312,7 +312,7 @@ evas_image_load_file_data_tiff(Image_Entry *ie, const char *file, const char *ke
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
INFO("channel bits == %i", (int)rgba_image.rgba.samplesperpixel);
|
INF("channel bits == %i", (int)rgba_image.rgba.samplesperpixel);
|
||||||
}
|
}
|
||||||
|
|
||||||
_TIFFfree(rast);
|
_TIFFfree(rast);
|
||||||
|
|
|
@ -202,7 +202,7 @@ evas_image_load_file_xpm(Image_Entry *ie, const char *file, const char *key __UN
|
||||||
/* Header */
|
/* Header */
|
||||||
if (sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp) != 4)
|
if (sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp) != 4)
|
||||||
{
|
{
|
||||||
ERROR("XPM ERROR: XPM file malformed header");
|
ERR("XPM ERROR: XPM file malformed header");
|
||||||
free(line);
|
free(line);
|
||||||
fclose(f);
|
fclose(f);
|
||||||
xpm_parse_done();
|
xpm_parse_done();
|
||||||
|
@ -210,7 +210,7 @@ evas_image_load_file_xpm(Image_Entry *ie, const char *file, const char *key __UN
|
||||||
}
|
}
|
||||||
if ((ncolors > 32766) || (ncolors < 1))
|
if ((ncolors > 32766) || (ncolors < 1))
|
||||||
{
|
{
|
||||||
ERROR("XPM ERROR: XPM files with colors > 32766 or < 1 not supported");
|
ERR("XPM ERROR: XPM files with colors > 32766 or < 1 not supported");
|
||||||
free(line);
|
free(line);
|
||||||
fclose(f);
|
fclose(f);
|
||||||
xpm_parse_done();
|
xpm_parse_done();
|
||||||
|
@ -218,7 +218,7 @@ evas_image_load_file_xpm(Image_Entry *ie, const char *file, const char *key __UN
|
||||||
}
|
}
|
||||||
if ((cpp > 5) || (cpp < 1))
|
if ((cpp > 5) || (cpp < 1))
|
||||||
{
|
{
|
||||||
ERROR("XPM ERROR: XPM files with characters per pixel > 5 or < 1not supported");
|
ERR("XPM ERROR: XPM files with characters per pixel > 5 or < 1not supported");
|
||||||
free(line);
|
free(line);
|
||||||
fclose(f);
|
fclose(f);
|
||||||
xpm_parse_done();
|
xpm_parse_done();
|
||||||
|
@ -226,7 +226,7 @@ evas_image_load_file_xpm(Image_Entry *ie, const char *file, const char *key __UN
|
||||||
}
|
}
|
||||||
if ((w > IMG_MAX_SIZE) || (w < 1))
|
if ((w > IMG_MAX_SIZE) || (w < 1))
|
||||||
{
|
{
|
||||||
ERROR("XPM ERROR: Image width > IMG_MAX_SIZE or < 1 pixels for file");
|
ERR("XPM ERROR: Image width > IMG_MAX_SIZE or < 1 pixels for file");
|
||||||
free(line);
|
free(line);
|
||||||
fclose(f);
|
fclose(f);
|
||||||
xpm_parse_done();
|
xpm_parse_done();
|
||||||
|
@ -234,7 +234,7 @@ evas_image_load_file_xpm(Image_Entry *ie, const char *file, const char *key __UN
|
||||||
}
|
}
|
||||||
if ((h > IMG_MAX_SIZE) || (h < 1))
|
if ((h > IMG_MAX_SIZE) || (h < 1))
|
||||||
{
|
{
|
||||||
ERROR("XPM ERROR: Image height > IMG_MAX_SIZE or < 1 pixels for file");
|
ERR("XPM ERROR: Image height > IMG_MAX_SIZE or < 1 pixels for file");
|
||||||
free(line);
|
free(line);
|
||||||
fclose(f);
|
fclose(f);
|
||||||
xpm_parse_done();
|
xpm_parse_done();
|
||||||
|
@ -242,8 +242,7 @@ evas_image_load_file_xpm(Image_Entry *ie, const char *file, const char *key __UN
|
||||||
}
|
}
|
||||||
if (IMG_TOO_BIG(w, h))
|
if (IMG_TOO_BIG(w, h))
|
||||||
{
|
{
|
||||||
fprintf(stderr,
|
ERR("XPM ERROR: Image just too big to ever allocate");
|
||||||
"XPM ERROR: Image just too big to ever allocate");
|
|
||||||
free(line);
|
free(line);
|
||||||
fclose(f);
|
fclose(f);
|
||||||
xpm_parse_done();
|
xpm_parse_done();
|
||||||
|
|
Loading…
Reference in New Issue