Hi Everyone,
I did 2 cleaner patch on Evas.
I hope this time you will get the files.
the changes are trivial as the previous patch
Index: src/lib/canvas/evas_object_textblock.c
===================================================================
--- src/lib/canvas/evas_object_textblock.c (révision 41024)
+++ src/lib/canvas/evas_object_textblock.c (copie de travail)
@@ -467,9 +467,6 @@
static void
_lines_clear(const Evas_Object *obj, Evas_Object_Textblock_Line *lines)
{
- Evas_Object_Textblock *o;
-
- o = (Evas_Object_Textblock *)(obj->object_data);
while (lines)
{
Evas_Object_Textblock_Line *ln;
@@ -750,7 +747,6 @@
p = str;
p2 = str2;
white = 0;
- pwhite = 0;
start = 1;
ok = 1;
while (*p != 0)
@@ -3218,10 +3214,7 @@
EAPI Evas_Bool
evas_textblock_cursor_node_next(Evas_Textblock_Cursor *cur)
{
- Evas_Object_Textblock *o;
-
if (!cur) return 0;
- o = (Evas_Object_Textblock *)(cur->obj->object_data);
if (!cur->node) return 0;
if ((EINA_INLIST_GET(cur->node))->next)
{
@@ -3241,10 +3234,7 @@
EAPI Evas_Bool
evas_textblock_cursor_node_prev(Evas_Textblock_Cursor *cur)
{
- Evas_Object_Textblock *o;
-
if (!cur) return 0;
- o = (Evas_Object_Textblock *)(cur->obj->object_data);
if (!cur->node) return 0;
if ((EINA_INLIST_GET(cur->node))->prev)
{
@@ -3263,12 +3253,10 @@
EAPI Evas_Bool
evas_textblock_cursor_char_next(Evas_Textblock_Cursor *cur)
{
- Evas_Object_Textblock *o;
- int index, tindex, ch;
+ int index, ch;
int at_start_of_line = 0;
if (!cur) return 0;
- o = (Evas_Object_Textblock *)(cur->obj->object_data);
if (!cur->node) return 0;
if (cur->node->type == NODE_FORMAT) return 0;
if (!cur->node->text) return 0;
@@ -3288,7 +3276,6 @@
ch = evas_common_font_utf8_get_next((unsigned char *)(cur->node->text), &index);
if ((ch == 0) || (index < 0)) return 0;
if (cur->node->text[index] == 0) return 0;
- tindex = index;
cur->pos = index;
cur->eol = 0; // 1
return 1;
@@ -3302,13 +3289,11 @@
EAPI Evas_Bool
evas_textblock_cursor_char_prev(Evas_Textblock_Cursor *cur)
{
- Evas_Object_Textblock *o;
- int index, ch;
+ int index;
int at_end_of_line = 0;
int at_start_of_line = 0;
if (!cur) return 0;
- o = (Evas_Object_Textblock *)(cur->obj->object_data);
if (!cur->node) return 0;
if (cur->node->type == NODE_FORMAT) return 0;
if (!cur->node->text) return 0;
@@ -3343,7 +3328,7 @@
cur->eol = 0;
return 1;
}
- ch = evas_common_font_utf8_get_prev((unsigned char *)(cur->node->text), &index);
+ evas_common_font_utf8_get_prev((unsigned char *)(cur->node->text), &index);
if (/*(ch == 0) || */(index < 0)) return 0;
cur->pos = index;
if (at_start_of_line)
@@ -3701,7 +3686,6 @@
{
Evas_Object_Textblock *o;
Evas_Object_Textblock_Node *n, *nrel;
- int index;
if (!cur) return;
o = (Evas_Object_Textblock *)(cur->obj->object_data);
@@ -3747,7 +3731,6 @@
o->nodes = (Evas_Object_Textblock_Node *)eina_inlist_prepend(EINA_INLIST_GET(o->nodes), EINA_INLIST_GET(n));
}
cur->node = n;
- index = cur->pos;
if (cur->pos > (n->len - 1))
n->text = _strbuf_append(n->text, (char *)text, &(n->len), &(n->alloc));
else
@@ -4313,7 +4296,7 @@
free(n2);
}
}
- if (format_hump) format_hump = eina_list_free(format_hump);
+ if (format_hump) eina_list_free(format_hump);
cur1->node = tcur.node;
cur1->pos = tcur.pos;
cur2->node = tcur.node;
@@ -4423,21 +4406,13 @@
{
char *s;
char *item;
- int push = 0;
- int pop = 0;
int visible = 0;
s = n->text;
- if (s[0] == '+')
+ if (s[0] == '+' || s[0] == '-')
{
- push = 1;
s++;
}
- else if (s[0] == '-')
- {
- pop = 1;
- s++;
- }
while ((item = _format_parse(&s)))
{
char tmp_delim = *s;
@@ -4466,8 +4441,8 @@
Evas_Object_Textblock *o;
Evas_Object_Textblock_Node *n1, *n2, *n;
char *txt = NULL, *s;
- int txt_len = 0, txt_alloc = 0, chr, index;
-
+ int txt_len = 0, txt_alloc = 0, index;
+
if (!cur1) return NULL;
if (!cur2) return NULL;
if (cur1->obj != cur2->obj) return NULL;
@@ -4475,7 +4450,7 @@
if (evas_textblock_cursor_compare(cur1, cur2) > 0)
{
const Evas_Textblock_Cursor *tc;
-
+
tc = cur1;
cur1 = cur2;
cur2 = tc;
@@ -4483,7 +4458,7 @@
n1 = cur1->node;
n2 = cur2->node;
index = cur2->pos;
- chr = evas_common_font_utf8_get_next((unsigned char *)n2->text, &index);
+ evas_common_font_utf8_get_next((unsigned char *)n2->text, &index);
EINA_INLIST_FOREACH(n1, n)
{
if (n->type == NODE_TEXT)
@@ -4492,7 +4467,7 @@
if (format == EVAS_TEXTBLOCK_TEXT_MARKUP)
{
char *p, *ps, *pe;
-
+
if (n->text)
{
if ((n == n1) && (n == n2))
@@ -4520,7 +4495,7 @@
{
const char *escape;
int adv;
-
+
escape = _escaped_char_match(p, &adv);
if (escape)
{
@@ -4530,7 +4505,7 @@
else
{
char str[2];
-
+
str[0] = *p;
str[1] = 0;
txt = _strbuf_append(txt, str, &txt_len, &txt_alloc);
@@ -4588,7 +4563,7 @@
{
int push = 0;
int pop = 0;
-
+
// FIXME: need to escape
s = n->text;
if (*s == '+') push = 1;
@@ -4848,7 +4823,6 @@
EAPI Eina_List *
evas_textblock_cursor_range_geometry_get(const Evas_Textblock_Cursor *cur1, const Evas_Textblock_Cursor *cur2)
{
- Evas_Object_Textblock *o;
Eina_List *rects = NULL;
Evas_Coord cx, cy, cw, ch, lx, ly, lw, lh;
Evas_Textblock_Rectangle *tr;
@@ -4857,7 +4831,6 @@
if (!cur1) return NULL;
if (!cur2) return NULL;
if (cur1->obj != cur2->obj) return NULL;
- o = (Evas_Object_Textblock *)(cur1->obj->object_data);
if (evas_textblock_cursor_compare(cur1, cur2) > 0)
{
const Evas_Textblock_Cursor *tc;
@@ -5657,17 +5630,17 @@
static void
evas_object_textblock_render_post(Evas_Object *obj)
{
- Evas_Object_Textblock *o;
+/* Evas_Object_Textblock *o; */
/* this moves the current data to the previous state parts of the object */
/* in whatever way is safest for the object. also if we don't need object */
/* data anymore we can free it if the object deems this is a good idea */
- o = (Evas_Object_Textblock *)(obj->object_data);
+/* o = (Evas_Object_Textblock *)(obj->object_data); */
/* remove those pesky changes */
evas_object_clip_changes_clean(obj);
/* move cur to prev safely for object data */
obj->prev = obj->cur;
-// o->prev = o->cur;
+/* o->prev = o->cur; */
/* o->changed = 0; */
}
@@ -5701,22 +5674,16 @@
static int
evas_object_textblock_is_opaque(Evas_Object *obj)
{
- Evas_Object_Textblock *o;
-
/* this returns 1 if the internal object data implies that the object is */
/* currently fulyl opque over the entire gradient it occupies */
- o = (Evas_Object_Textblock *)(obj->object_data);
return 0;
}
static int
evas_object_textblock_was_opaque(Evas_Object *obj)
{
- Evas_Object_Textblock *o;
-
/* this returns 1 if the internal object data implies that the object was */
/* currently fulyl opque over the entire gradient it occupies */
- o = (Evas_Object_Textblock *)(obj->object_data);
return 0;
}
@@ -5737,9 +5704,6 @@
static void
evas_object_textblock_scale_update(Evas_Object *obj)
{
- Evas_Object_Textblock *o;
-
- o = (Evas_Object_Textblock *)(obj->object_data);
_relayout(obj);
}
Index: src/lib/engines/common_16/evas_soft16_dither_mask.c
===================================================================
--- src/lib/engines/common_16/evas_soft16_dither_mask.c (révision 41024)
+++ src/lib/engines/common_16/evas_soft16_dither_mask.c (copie de travail)
@@ -283,11 +283,10 @@
{
const DATA32 *sp;
DATA16 *dp;
- int y, pad;
+ int y;
sp = src;
dp = im->pixels;
- pad = im->stride - im->cache_entry.w;
for (y = 0; y < im->cache_entry.h; y++, sp += im->cache_entry.w, dp += im->stride)
_soft16_convert_from_rgb_scanline(sp, dp, y, im->cache_entry.w);
Index: src/lib/canvas/evas_object_line.c
===================================================================
--- src/lib/canvas/evas_object_line.c (révision 41024)
+++ src/lib/canvas/evas_object_line.c (copie de travail)
@@ -441,46 +441,34 @@
static int
evas_object_line_is_opaque(Evas_Object *obj)
{
- Evas_Object_Line *o;
-
/* this returns 1 if the internal object data implies that the object is */
/* currently fully opaque over the entire line it occupies */
- o = (Evas_Object_Line *)(obj->object_data);
return 0;
}
static int
evas_object_line_was_opaque(Evas_Object *obj)
{
- Evas_Object_Line *o;
-
/* this returns 1 if the internal object data implies that the object was */
/* previously fully opaque over the entire line it occupies */
- o = (Evas_Object_Line *)(obj->object_data);
return 0;
}
static int
evas_object_line_is_inside(Evas_Object *obj, Evas_Coord x __UNUSED__, Evas_Coord y __UNUSED__)
{
- Evas_Object_Line *o;
-
/* this returns 1 if the canvas co-ordinates are inside the object based */
/* on object private data. not much use for rects, but for polys, images */
/* and other complex objects it might be */
- o = (Evas_Object_Line *)(obj->object_data);
return 1;
}
static int
evas_object_line_was_inside(Evas_Object *obj, Evas_Coord x __UNUSED__, Evas_Coord y __UNUSED__)
{
- Evas_Object_Line *o;
-
/* this returns 1 if the canvas co-ordinates were inside the object based */
/* on object private data. not much use for rects, but for polys, images */
/* and other complex objects it might be */
- o = (Evas_Object_Line *)(obj->object_data);
return 1;
}
Index: src/lib/canvas/evas_object_polygon.c
===================================================================
--- src/lib/canvas/evas_object_polygon.c (révision 41024)
+++ src/lib/canvas/evas_object_polygon.c (copie de travail)
@@ -444,45 +444,33 @@
static int
evas_object_polygon_is_opaque(Evas_Object *obj)
{
- Evas_Object_Polygon *o;
-
/* this returns 1 if the internal object data implies that the object is */
/* currently fully opaque over the entire line it occupies */
- o = (Evas_Object_Polygon *)(obj->object_data);
return 0;
}
static int
evas_object_polygon_was_opaque(Evas_Object *obj)
{
- Evas_Object_Polygon *o;
-
/* this returns 1 if the internal object data implies that the object was */
/* previously fully opaque over the entire line it occupies */
- o = (Evas_Object_Polygon *)(obj->object_data);
return 0;
}
static int
evas_object_polygon_is_inside(Evas_Object *obj, Evas_Coord x __UNUSED__, Evas_Coord y __UNUSED__)
{
- Evas_Object_Polygon *o;
-
/* this returns 1 if the canvas co-ordinates are inside the object based */
/* on object private data. not much use for rects, but for polys, images */
/* and other complex objects it might be */
- o = (Evas_Object_Polygon *)(obj->object_data);
return 1;
}
static int
evas_object_polygon_was_inside(Evas_Object *obj, Evas_Coord x __UNUSED__, Evas_Coord y __UNUSED__)
{
- Evas_Object_Polygon *o;
-
/* this returns 1 if the canvas co-ordinates were inside the object based */
/* on object private data. not much use for rects, but for polys, images */
/* and other complex objects it might be */
- o = (Evas_Object_Polygon *)(obj->object_data);
return 1;
}
Index: src/lib/canvas/evas_object_box.c
===================================================================
--- src/lib/canvas/evas_object_box.c (révision 41024)
+++ src/lib/canvas/evas_object_box.c (copie de travail)
@@ -1663,7 +1663,7 @@
void
evas_object_box_layout_flow_vertical(Evas_Object *o, Evas_Object_Box_Data *priv, void *data __UNUSED__)
{
- int n_children, h_justify;
+ int n_children;
int c, col_count;
int min_w = 0, min_h = 0;
int max_w, inc_x;
@@ -1689,7 +1689,6 @@
(priv, h, &col_count, col_max_w, col_break, col_height, &off_x, &max_w);
inc_x = 0;
- h_justify = 0;
remain_x = w - (off_x + max_w);
if (remain_x > 0)
Index: src/lib/canvas/evas_object_text.c
===================================================================
--- src/lib/canvas/evas_object_text.c (révision 41024)
+++ src/lib/canvas/evas_object_text.c (copie de travail)
@@ -1724,22 +1724,16 @@
static int
evas_object_text_is_opaque(Evas_Object *obj)
{
- Evas_Object_Text *o;
-
/* this returns 1 if the internal object data implies that the object is */
/* currently fulyl opque over the entire gradient it occupies */
- o = (Evas_Object_Text *)(obj->object_data);
return 0;
}
static int
evas_object_text_was_opaque(Evas_Object *obj)
{
- Evas_Object_Text *o;
-
/* this returns 1 if the internal object data implies that the object was */
/* currently fulyl opque over the entire gradient it occupies */
- o = (Evas_Object_Text *)(obj->object_data);
return 0;
}
Index: src/modules/loaders/jpeg/evas_image_load_jpeg.c
===================================================================
--- src/modules/loaders/jpeg/evas_image_load_jpeg.c (révision 41024)
+++ src/modules/loaders/jpeg/evas_image_load_jpeg.c (copie de travail)
@@ -192,7 +192,7 @@
struct _JPEG_error_mgr jerr;
DATA8 *ptr, *line[16], *data;
DATA32 *ptr2;
- int x, y, l, i, scans, count, prevy;
+ int x, y, l, i, scans, count;
if (!f) return 0;
cinfo.err = jpeg_std_error(&(jerr.pub));
@@ -273,7 +273,6 @@
}
ptr2 = evas_cache_image_pixels(ie);
count = 0;
- prevy = 0;
/* We handle first CMYK (4 components) */
if (cinfo.output_components == 4)
{
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
