Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_out.c edje_decc.c edje_thumb.c
Log Message:
handle more returns with more info
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_out.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- edje_cc_out.c 11 Nov 2005 06:49:57 -0000 1.43
+++ edje_cc_out.c 23 Jan 2006 15:13:44 -0000 1.44
@@ -316,6 +316,11 @@
ecore_init();
ecore_evas_init();
ee = ecore_evas_buffer_new(1, 1);
+ if (!ee)
+ {
+ fprintf(stderr, "Error. cannot create buffer engine canvas for
image load.\n");
+ ABORT_WRITE(ef, file_out);
+ }
evas = ecore_evas_get(ee);
for (l = edje_file->image_dir->entries; l; l = l->next)
{
@@ -424,7 +429,7 @@
0, qual, 1);
if (bytes <= 0)
{
- fprintf(stderr, "%s: Error. unable to write
image part \"%s\" as \"%s\" part entry to %s \n",
+ fprintf(stderr, "%s: Error. unable to write
image part \"%s\" as \"%s\" part entry to %s\n",
progname, img->entry, buf, file_out);
ABORT_WRITE(ef, file_out);
}
@@ -436,7 +441,7 @@
}
else
{
- fprintf(stderr, "%s: Error. unable to load image
for image part \"%s\" as \"%s\" part entry to %s \n",
+ fprintf(stderr, "%s: Error. unable to load image
for image part \"%s\" as \"%s\" part entry to %s\n",
progname, img->entry, buf, file_out);
ABORT_WRITE(ef, file_out);
}
@@ -460,7 +465,7 @@
}
else
{
- fprintf(stderr, "%s: Error. unable to load image for
image \"%s\" part entry to %s \n",
+ fprintf(stderr, "%s: Error. unable to load image for
image \"%s\" part entry to %s. Missing PNG ot JPEG loader modules for Evas or
file does not exist, or is not readable.\n",
progname, img->entry, file_out);
ABORT_WRITE(ef, file_out);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_decc.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- edje_decc.c 11 Nov 2005 06:49:57 -0000 1.15
+++ edje_decc.c 23 Jan 2006 15:13:44 -0000 1.16
@@ -151,8 +151,18 @@
ecore_init();
ecore_evas_init();
ee = ecore_evas_buffer_new(1, 1);
+ if (!ee)
+ {
+ fprintf(stderr, "Error. cannot create buffer engine
canvas for image save.\n");
+ exit(-1);
+ }
evas = ecore_evas_get(ee);
im = evas_object_image_add(evas);
+ if (!im)
+ {
+ fprintf(stderr, "Error. cannot create image object for
save.\n");
+ exit(-1);
+ }
snprintf(buf, sizeof(buf), "images/%i", ei->id);
evas_object_image_file_set(im, file_in, buf);
snprintf(out, sizeof(out), "%s/%s", outdir, ei->entry);
@@ -163,11 +173,15 @@
if (strstr(pp, "../"))
{
printf("ERROR: potential security violation. attempt to
write in parent dir.\n");
- exit (-1);
+ exit(-1);
}
e_file_mkpath(pp);
free(pp);
- evas_object_image_save(im, out, NULL, "quality=100
compress=9");
+ if (!evas_object_image_save(im, out, NULL, "quality=100
compress=9"))
+ {
+ printf("ERROR: cannot write file %s. Perhaps missing
JPEG or PNG saver modules for Evas.\n", out);
+ exit(-1);
+ }
evas_object_del(im);
ecore_evas_free(ee);
ecore_evas_shutdown();
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_thumb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_thumb.c 11 Nov 2005 06:49:57 -0000 1.3
+++ edje_thumb.c 23 Jan 2006 15:13:44 -0000 1.4
@@ -31,9 +31,19 @@
args_parse();
ee = ecore_evas_buffer_new(outw, outh);
+ if (!ee)
+ {
+ fprintf(stderr, "Error. cannot create buffer engine canvas for image
save.\n");
+ exit(-1);
+ }
evas = ecore_evas_get(ee);
im = ecore_evas_object_image_new(ee);
+ if (!im)
+ {
+ fprintf(stderr, "Error. cannot create buffer canvas image object for
scaling.\n");
+ exit(-1);
+ }
evas_object_move(im, 0, 0);
evas_object_resize(im, outw, outh);
evas_object_image_fill_set(im, 0, 0, outw, outh);
@@ -43,6 +53,11 @@
evas_im = ecore_evas_get(ee_im);
im2 = ecore_evas_object_image_new(ee_im);
+ if (!im2)
+ {
+ fprintf(stderr, "Error. cannot create buffer canvas image for
scaling.\n");
+ exit(-1);
+ }
evas_object_move(im2, 0, 0);
evas_object_resize(im2, outw, outh);
evas_object_image_fill_set(im2, 0, 0, outw, outh);
@@ -194,7 +209,11 @@
snprintf(buf, sizeof(buf), outfile, frnum);
ecore_evas_buffer_pixels_get(ee);
- evas_object_image_save(im, buf, NULL, "quality=100 compress=9");
+ if (!evas_object_image_save(im, buf, NULL, "quality=100 compress=9"))
+ {
+ printf("Cannot load file \"%s\". Missing saver moduel for Evas or
literally cannto write the file (permissions or directory doesnt exist).\n",
buf);
+ exit(-1);
+ }
frnum++;
if (frnum == frames)
{
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
