Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc.h edje_cc_handlers.c edje_cc_out.c edje_cc_parse.c
edje_ls.c edje_main.c
Log Message:
remove lots of warnings
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edje_cc.h 23 Jul 2003 05:19:50 -0000 1.7
+++ edje_cc.h 19 Oct 2003 02:11:06 -0000 1.8
@@ -17,6 +17,7 @@
#include <sys/stat.h>
#include <stdarg.h>
#include <locale.h>
+#include <ctype.h>
/* types */
typedef struct _New_Object_Handler New_Object_Handler;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_handlers.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- edje_cc_handlers.c 1 Sep 2003 02:53:08 -0000 1.22
+++ edje_cc_handlers.c 19 Oct 2003 02:11:06 -0000 1.23
@@ -1093,7 +1093,6 @@
{
Edje_Part_Collection *pc;
Edje_Part *ep;
- Edje_Part_Description *ed;
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_out.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edje_cc_out.c 11 Jul 2003 01:47:42 -0000 1.7
+++ edje_cc_out.c 19 Oct 2003 02:11:06 -0000 1.8
@@ -71,6 +71,7 @@
int image_num;
int collection_num;
+ bytes = 0;
input_bytes = 0;
total_bytes = 0;
input_raw_bytes = 0;
@@ -83,96 +84,112 @@
progname, file_out);
exit(-1);
}
- bytes = eet_data_write(ef, edd_edje_file, "edje_file", edje_file, 1);
- if (bytes <= 0)
+ if (edje_file)
{
- fprintf(stderr, "%s: Error. unable to write \"edje_file\" entry to \"%s\" \n",
- progname, file_out);
- exit(-1);
+ bytes = eet_data_write(ef, edd_edje_file, "edje_file", edje_file, 1);
+ if (bytes <= 0)
+ {
+ fprintf(stderr, "%s: Error. unable to write \"edje_file\" entry to \"%s\"
\n",
+ progname, file_out);
+ exit(-1);
+ }
+ else
+ total_bytes += bytes;
}
- else
- total_bytes += bytes;
if (verbose)
{
printf("%s: Wrote %9i bytes (%4iKb) for \"edje_file\" header\n",
progname, bytes, (bytes + 512) / 1024);
}
- for (l = edje_file->image_dir->entries; l; l = l->next)
+ if ((edje_file) && (edje_file->image_dir))
{
- Edje_Image_Directory_Entry *img;
-
- img = l->data;
- if (img->source_type != EDJE_IMAGE_SOURCE_TYPE_EXTERNAL)
+ for (l = edje_file->image_dir->entries; l; l = l->next)
{
- Imlib_Image im;
- Evas_List *l;
-
- im = NULL;
- imlib_set_cache_size(0);
- for (l = img_dirs; l; l = l->next)
- {
- char buf[4096];
-
- snprintf(buf, sizeof(buf), "%s/%s", l->data, img->entry);
- im = imlib_load_image(buf);
- if (im) break;
- }
- if (!im) im = imlib_load_image(img->entry);
- if (im)
+ Edje_Image_Directory_Entry *img;
+
+ img = l->data;
+ if (img->source_type != EDJE_IMAGE_SOURCE_TYPE_EXTERNAL)
{
- DATA32 *im_data;
- int im_w, im_h;
- int im_alpha;
- char buf[256];
+ Imlib_Image im;
+ Evas_List *l;
- imlib_context_set_image(im);
- im_w = imlib_image_get_width();
- im_h = imlib_image_get_height();
- im_alpha = imlib_image_has_alpha();
- im_data = imlib_image_get_data_for_reading_only();
- snprintf(buf, sizeof(buf), "images/%i", img->id);
- if (img->source_type == EDJE_IMAGE_SOURCE_TYPE_INLINE_PERFECT)
- bytes = eet_data_image_write(ef, buf,
- im_data, im_w, im_h,
- im_alpha,
- img->source_param, 0, 0);
- else
- bytes = eet_data_image_write(ef, buf,
- im_data, im_w, im_h,
- im_alpha,
- 0, img->source_param, 1);
- if (bytes <= 0)
+ im = NULL;
+ imlib_set_cache_size(0);
+ for (l = img_dirs; l; l = l->next)
{
- fprintf(stderr, "%s: Error. unable to write image part \"%s\"
as \"%s\" part entry to %s \n",
- progname, img->entry, buf, file_out);
- exit(-1);
+ char buf[4096];
+
+ snprintf(buf, sizeof(buf), "%s/%s",
+ (char *)(l->data), img->entry);
+ im = imlib_load_image(buf);
+ if (im) break;
}
- else
+ if (!im) im = imlib_load_image(img->entry);
+ if (im)
{
- image_num++;
- total_bytes += bytes;
+ DATA32 *im_data;
+ int im_w, im_h;
+ int im_alpha;
+ char buf[256];
+
+ imlib_context_set_image(im);
+ im_w = imlib_image_get_width();
+ im_h = imlib_image_get_height();
+ im_alpha = imlib_image_has_alpha();
+ im_data = imlib_image_get_data_for_reading_only();
+ if ((im_data) && (im_w > 0) && (im_h > 0))
+ {
+ snprintf(buf, sizeof(buf), "images/%i", img->id);
+ if (img->source_type ==
EDJE_IMAGE_SOURCE_TYPE_INLINE_PERFECT)
+ bytes = eet_data_image_write(ef, buf,
+ im_data, im_w, im_h,
+ im_alpha,
+ img->source_param, 0, 0);
+ else
+ bytes = eet_data_image_write(ef, buf,
+ im_data, im_w, im_h,
+ im_alpha,
+ 0, img->source_param, 1);
+ if (bytes <= 0)
+ {
+ fprintf(stderr, "%s: Error. unable to write image
part \"%s\" as \"%s\" part entry to %s \n",
+ progname, img->entry, buf, file_out);
+ exit(-1);
+ }
+ else
+ {
+ image_num++;
+ total_bytes += bytes;
+ }
+ }
+ else
+ {
+ fprintf(stderr, "%s: Error. unable to write image part
\"%s\" as \"%s\" part entry to %s \n",
+ progname, img->entry, buf, file_out);
+ exit(-1);
+ }
+ if (verbose)
+ {
+ struct stat st;
+
+ if (stat(imlib_image_get_filename(), &st) != 0)
+ st.st_size = 0;
+ input_bytes += st.st_size;
+ input_raw_bytes += im_w * im_h * 4;
+ printf("%s: Wrote %9i bytes (%4iKb) for \"%s\" image entry
\"%s\" compress: [raw: %2.1f%%] [real: %2.1f%%]\n",
+ progname, bytes, (bytes + 512) / 1024, buf,
img->entry,
+ 100 - (100 * (double)bytes) / ((double)(im_w * im_h
* 4)),
+ 100 - (100 * (double)bytes) / ((double)(st.st_size))
+ );
+ }
+ if (im_data) imlib_image_put_back_data(im_data);
+ imlib_free_image();
}
- if (verbose)
+ else
{
- struct stat st;
-
- if (stat(imlib_image_get_filename(), &st) != 0)
- st.st_size = 0;
- input_bytes += st.st_size;
- input_raw_bytes += im_w * im_h * 4;
- printf("%s: Wrote %9i bytes (%4iKb) for \"%s\" image entry
\"%s\" compress: [raw: %2.1f%%] [real: %2.1f%%]\n",
- progname, bytes, (bytes + 512) / 1024, buf, img->entry,
- 100 - (100 * (double)bytes) / ((double)(im_w * im_h *
4)),
- 100 - (100 * (double)bytes) / ((double)(st.st_size))
- );
+ fprintf(stderr, "%s: Warning. unable to open image \"%s\" for
inclusion in output\n",
+ progname, img->entry);
}
- imlib_image_put_back_data(im_data);
- imlib_free_image();
- }
- else
- {
- fprintf(stderr, "%s: Warning. unable to open image \"%s\" for
inclusion in output\n",
- progname, img->entry);
}
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_parse.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- edje_cc_parse.c 29 Aug 2003 08:34:53 -0000 1.11
+++ edje_cc_parse.c 19 Oct 2003 02:11:06 -0000 1.12
@@ -37,7 +37,8 @@
if (!handled)
{
fprintf(stderr, "%s: Error. %s:%i unhandled keyword %s\n",
- progname, file_in, line, evas_list_data(evas_list_last(stack)));
+ progname, file_in, line,
+ (char *)evas_list_data(evas_list_last(stack)));
exit(-1);
}
free(id);
@@ -66,7 +67,8 @@
if (!handled)
{
fprintf(stderr, "%s: Error. %s:%i unhandled keyword %s\n",
- progname, file_in, line, evas_list_data(evas_list_last(stack)));
+ progname, file_in, line,
+ (char *)evas_list_data(evas_list_last(stack)));
exit(-1);
}
free(id);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_ls.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_ls.c 16 Oct 2003 07:02:31 -0000 1.1
+++ edje_ls.c 19 Oct 2003 02:11:06 -0000 1.2
@@ -29,7 +29,6 @@
for (l = entries; l; l = l->next)
{
char *name;
- Evas_Object *o;
char buf[1024];
name = l->data;
@@ -43,7 +42,6 @@
int main(int argc, char **argv)
{
int i;
- Evas_List *l;
FILE *output;
progname = argv[0];
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_main.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- edje_main.c 18 Oct 2003 03:34:54 -0000 1.32
+++ edje_main.c 19 Oct 2003 02:11:06 -0000 1.33
@@ -107,7 +107,6 @@
#else
ecore_evas = ecore_evas_fb_new(NULL, 270, startw, starth);
#endif
- canvas_up:
if (!ecore_evas) return -1;
ecore_evas_callback_delete_request_set(ecore_evas, main_delete_request);
ecore_evas_callback_resize_set(ecore_evas, main_resize);
@@ -784,7 +783,6 @@
for (i = 1; i < argc; i++)
{
char *file;
- char *coll;
int done;
done = 0;
@@ -794,18 +792,6 @@
(!strcmp(file, "--geometry"))) && (i < (argc - 1)))
i++;
if (file[0] == '-') continue;
-/*
- if (argc > (i + 1))
- {
- coll = argv[i + 1];
- if (strlen(coll) > 0)
- {
- test_setup(file, coll);
- done = 1;
- }
- i++;
- }
- */
if (!done) test_list(file);
}
-------------------------------------------------------
This SF.net email sponsored by: Enterprise Linux Forum Conference & Expo
The Event For Linux Datacenter Solutions & Strategies in The Enterprise
Linux in the Boardroom; in the Front Office; & in the Server Room
http://www.enterpriselinuxforum.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
