Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_handlers.c
Log Message:
image{} and fill{} attributes are only allowed for IMAGE parts. text{} attributes are
only allowed for TEXT parts
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_handlers.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- edje_cc_handlers.c 19 Oct 2004 17:01:05 -0000 1.43
+++ edje_cc_handlers.c 19 Oct 2004 17:21:13 -0000 1.44
@@ -1170,6 +1170,15 @@
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
+
+ if (ep->type != EDJE_PART_TYPE_IMAGE)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "image attributes in non-IMAGE part.\n",
+ progname, file_in, line);
+ exit(-1);
+ }
+
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
{
@@ -1190,6 +1199,15 @@
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
+
+ if (ep->type != EDJE_PART_TYPE_IMAGE)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "image attributes in non-IMAGE part.\n",
+ progname, file_in, line);
+ exit(-1);
+ }
+
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
{
@@ -1213,6 +1231,15 @@
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
+
+ if (ep->type != EDJE_PART_TYPE_IMAGE)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "image attributes in non-IMAGE part.\n",
+ progname, file_in, line);
+ exit(-1);
+ }
+
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
ed->border.l = parse_int_range(0, 0, 0x7fffffff);
@@ -1240,6 +1267,15 @@
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
+
+ if (ep->type != EDJE_PART_TYPE_IMAGE)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "fill attributes in non-IMAGE part.\n",
+ progname, file_in, line);
+ exit(-1);
+ }
+
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
ed->fill.smooth = parse_bool(0);
@@ -1254,6 +1290,15 @@
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
+
+ if (ep->type != EDJE_PART_TYPE_IMAGE)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "fill attributes in non-IMAGE part.\n",
+ progname, file_in, line);
+ exit(-1);
+ }
+
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
ed->fill.pos_rel_x = parse_float_range(0, 0.0, 999999999.0);
@@ -1269,6 +1314,15 @@
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
+
+ if (ep->type != EDJE_PART_TYPE_IMAGE)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "fill attributes in non-IMAGE part.\n",
+ progname, file_in, line);
+ exit(-1);
+ }
+
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
ed->fill.pos_abs_x = parse_int(0);
@@ -1286,6 +1340,15 @@
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
+
+ if (ep->type != EDJE_PART_TYPE_IMAGE)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "fill attributes in non-IMAGE part.\n",
+ progname, file_in, line);
+ exit(-1);
+ }
+
ed->fill.rel_x = parse_float_range(0, 0.0, 999999999.0);
ed->fill.rel_y = parse_float_range(1, 0.0, 999999999.0);
}
@@ -1301,6 +1364,15 @@
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
+
+ if (ep->type != EDJE_PART_TYPE_IMAGE)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "fill attributes in non-IMAGE part.\n",
+ progname, file_in, line);
+ exit(-1);
+ }
+
ed->fill.abs_x = parse_int(0);
ed->fill.abs_y = parse_int(1);
}
@@ -1379,6 +1451,15 @@
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
+
+ if (ep->type != EDJE_PART_TYPE_TEXT)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "text attributes in non-TEXT part.\n",
+ progname, file_in, line);
+ exit(-1);
+ }
+
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
ed->text.text = parse_str(0);
@@ -1393,6 +1474,15 @@
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
+
+ if (ep->type != EDJE_PART_TYPE_TEXT)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "text attributes in non-TEXT part.\n",
+ progname, file_in, line);
+ exit(-1);
+ }
+
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
ed->text.text_class = parse_str(0);
@@ -1407,6 +1497,15 @@
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
+
+ if (ep->type != EDJE_PART_TYPE_TEXT)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "text attributes in non-TEXT part.\n",
+ progname, file_in, line);
+ exit(-1);
+ }
+
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
ed->text.font = parse_str(0);
@@ -1421,6 +1520,15 @@
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
+
+ if (ep->type != EDJE_PART_TYPE_TEXT)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "text attributes in non-TEXT part.\n",
+ progname, file_in, line);
+ exit(-1);
+ }
+
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
ed->text.size = parse_int_range(0, 0, 255);
@@ -1455,6 +1563,15 @@
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
+
+ if (ep->type != EDJE_PART_TYPE_TEXT)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "text attributes in non-TEXT part.\n",
+ progname, file_in, line);
+ exit(-1);
+ }
+
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
ed->text.fit_x = parse_bool(0);
@@ -1470,6 +1587,15 @@
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
+
+ if (ep->type != EDJE_PART_TYPE_TEXT)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "text attributes in non-TEXT part.\n",
+ progname, file_in, line);
+ exit(-1);
+ }
+
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
ed->text.min_x = parse_bool(0);
@@ -1485,6 +1611,15 @@
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
+
+ if (ep->type != EDJE_PART_TYPE_TEXT)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "text attributes in non-TEXT part.\n",
+ progname, file_in, line);
+ exit(-1);
+ }
+
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
ed->text.align.x = parse_float_range(0, 0.0, 1.0);
@@ -1500,6 +1635,15 @@
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
+
+ if (ep->type != EDJE_PART_TYPE_TEXT)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "text attributes in non-TEXT part.\n",
+ progname, file_in, line);
+ exit(-1);
+ }
+
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
{
@@ -1520,6 +1664,15 @@
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
+
+ if (ep->type != EDJE_PART_TYPE_TEXT)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "text attributes in non-TEXT part.\n",
+ progname, file_in, line);
+ exit(-1);
+ }
+
ed = ep->default_desc;
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
{
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
