From 12af9492e11db1044bfe989d07202b7264ff940f Mon Sep 17 00:00:00 2001 From: cedric Date: Thu, 22 Oct 2009 16:39:20 +0000 Subject: [PATCH] * evas: Fix missing correction. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@43205 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/modules/loaders/tiff/evas_image_load_tiff.c | 6 +++--- src/modules/loaders/xpm/evas_image_load_xpm.c | 13 ++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/modules/loaders/tiff/evas_image_load_tiff.c b/src/modules/loaders/tiff/evas_image_load_tiff.c index f6e98b4..8d5772a 100644 --- a/src/modules/loaders/tiff/evas_image_load_tiff.c +++ b/src/modules/loaders/tiff/evas_image_load_tiff.c @@ -266,7 +266,7 @@ evas_image_load_file_data_tiff(Image_Entry *ie, const char *file, const char *ke if (!rast) { - ERROR("Evas Tiff loader: out of memory"); + ERR("Evas Tiff loader: out of memory"); TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image); 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) { - ERROR("Evas Tiff loader: no put function"); + ERR("Evas Tiff loader: no put function"); _TIFFfree(rast); TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image); @@ -312,7 +312,7 @@ evas_image_load_file_data_tiff(Image_Entry *ie, const char *file, const char *ke } else { - INFO("channel bits == %i", (int)rgba_image.rgba.samplesperpixel); + INF("channel bits == %i", (int)rgba_image.rgba.samplesperpixel); } _TIFFfree(rast); diff --git a/src/modules/loaders/xpm/evas_image_load_xpm.c b/src/modules/loaders/xpm/evas_image_load_xpm.c index 806e1d5..f9d4a24 100644 --- a/src/modules/loaders/xpm/evas_image_load_xpm.c +++ b/src/modules/loaders/xpm/evas_image_load_xpm.c @@ -202,7 +202,7 @@ evas_image_load_file_xpm(Image_Entry *ie, const char *file, const char *key __UN /* Header */ 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); fclose(f); 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)) { - 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); fclose(f); 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)) { - 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); fclose(f); 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)) { - 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); fclose(f); 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)) { - 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); fclose(f); 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)) { - fprintf(stderr, - "XPM ERROR: Image just too big to ever allocate"); + ERR("XPM ERROR: Image just too big to ever allocate"); free(line); fclose(f); xpm_parse_done(); -- 2.7.4