1. fix abort in tiff loader

2. slidesel theme garbage trailing. nuke
3. icon obj can have pre-scale set not. default is as before.
4. printf-- in slidesel


SVN revision: 33677
This commit is contained in:
Carsten Haitzler 2008-02-05 12:00:19 +00:00
parent 865f8ada56
commit 67844ebc4c
1 changed files with 2 additions and 3 deletions

View File

@ -157,7 +157,7 @@ evas_image_load_file_head_tiff(RGBA_Image *im, const char *file, const char *key
return 0; return 0;
} }
strcpy(txt, "Evas Tiff loader: cannot begin reading tiff"); strcpy(txt, "Evas Tiff loader: cannot begin reading tiff");
if (!TIFFRGBAImageBegin(& tiff_image, tif, 0, txt)) if (!TIFFRGBAImageBegin(& tiff_image, tif, 1, txt))
{ {
TIFFClose(tif); TIFFClose(tif);
return 0; return 0;
@ -308,14 +308,13 @@ evas_image_load_file_data_tiff(RGBA_Image *im, const char *file, const char *key
/* if (rgba_image.rgba.samplesperpixel == 8)*/ /* if (rgba_image.rgba.samplesperpixel == 8)*/
if (rgba_image.rgba.bitspersample == 8) if (rgba_image.rgba.bitspersample == 8)
{ {
if (!TIFFRGBAImageGet((TIFFRGBAImage *) & rgba_image, rast, if (!TIFFRGBAImageGet((TIFFRGBAImage *) &rgba_image, rast,
rgba_image.rgba.width, rgba_image.rgba.height)) rgba_image.rgba.width, rgba_image.rgba.height))
{ {
evas_common_image_surface_free(im->image); evas_common_image_surface_free(im->image);
_TIFFfree(rast); _TIFFfree(rast);
TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image); TIFFRGBAImageEnd((TIFFRGBAImage *) & rgba_image);
TIFFClose(tif); TIFFClose(tif);
return 0; return 0;
} }
} }