Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_blend_main.c evas_blit_main.c evas_convert_color.c
evas_convert_main.c evas_cpu.c evas_image_load.c
evas_image_main.c evas_image_save.c evas_line_main.c
evas_op_add_main_.c evas_op_blend_main_.c evas_op_copy_main_.c
evas_op_mask_main_.c evas_op_mul_main_.c evas_op_sub_main_.c
evas_scale_sample.c evas_scale_smooth_scaler.c
evas_scale_smooth_scaler_down.c
evas_scale_smooth_scaler_downx.c
evas_scale_smooth_scaler_downy.c
evas_scale_smooth_scaler_noscale.c
evas_scale_smooth_scaler_up.c evas_tiler.c
Log Message:
remove tons of trailing spaces
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_blend_main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- evas_blend_main.c 3 Jun 2008 09:09:35 -0000 1.13
+++ evas_blend_main.c 19 Jul 2008 17:40:51 -0000 1.14
@@ -322,4 +322,3 @@
return func;
return _composite_pt_nothing;
}
-
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_blit_main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- evas_blit_main.c 12 Apr 2008 00:32:25 -0000 1.9
+++ evas_blit_main.c 19 Jul 2008 17:40:51 -0000 1.10
@@ -122,7 +122,7 @@
src += len - 1;
while (dst < dst_end)
- *dst++ = *src--;
+ *dst++ = *src--;
}
#ifdef BUILD_C
@@ -132,7 +132,7 @@
DATA32 *dst_end = dst + len;
while (dst < dst_end)
- *dst++ = *src++;
+ *dst++ = *src++;
}
#endif
@@ -245,7 +245,7 @@
src_ptr++;
dst_ptr++;
}
-#if 0
+#if 0
#ifdef ALIGN_FIX
int src_align;
int dst_align;
@@ -290,7 +290,7 @@
src_ptr++;
dst_ptr++;
}
-#endif
+#endif
}
#endif
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_convert_color.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_convert_color.c 10 Jul 2008 22:53:33 -0000 1.7
+++ evas_convert_color.c 19 Jul 2008 17:40:51 -0000 1.8
@@ -15,8 +15,8 @@
{
DATA32 a = 1 + (*data >> 24);
- *data = (*data & 0xff000000) +
- (((((*data) >> 8) & 0xff) * a) & 0xff00) +
+ *data = (*data & 0xff000000) +
+ (((((*data) >> 8) & 0xff) * a) & 0xff00) +
(((((*data) & 0x00ff00ff) * a) >> 8) & 0x00ff00ff);
data++;
}
@@ -32,9 +32,9 @@
DATA32 a = (*data >> 24);
if ((a > 0) && (a < 255))
- *data = ARGB_JOIN(a,
- (R_VAL(data) * 255) / a,
- (G_VAL(data) * 255) / a,
+ *data = ARGB_JOIN(a,
+ (R_VAL(data) * 255) / a,
+ (G_VAL(data) * 255) / a,
(B_VAL(data) * 255) / a);
data++;
}
@@ -131,7 +131,7 @@
{
if (s) *s = 0;
if (h) *h = 0;
- return;
+ return;
}
if (s) *s = (d / (float)max);
@@ -221,7 +221,7 @@
if (!max)
{
*s = *h = 0;
- return;
+ return;
}
*s = ((d * 255) / max);
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_convert_main.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- evas_convert_main.c 11 Jul 2008 05:50:56 -0000 1.11
+++ evas_convert_main.c 19 Jul 2008 17:40:51 -0000 1.12
@@ -163,7 +163,7 @@
{
if ((rmask == 0) && (gmask == 0) && (bmask == 0))
{
- if (depth == 8)
+ if (depth == 8)
{
#ifdef BUILD_CONVERT_8_RGB_332
if (pal_mode == PAL_MODE_RGB332)
@@ -194,10 +194,10 @@
return evas_common_convert_rgba_to_8bpp_rgb_111_dith;
#endif
}
- if (depth == 1)
+ if (depth == 1)
{
}
- if (depth == 4)
+ if (depth == 4)
{
}
}
@@ -296,7 +296,7 @@
if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3)))
return evas_common_convert_rgba2_to_16bpp_rgb_555_dith;
else
- return evas_common_convert_rgba_to_16bpp_rgb_555_dith;
+ return evas_common_convert_rgba_to_16bpp_rgb_555_dith;
}
#endif
#ifdef BUILD_CONVERT_16_RGB_ROT180
@@ -454,7 +454,7 @@
}
#endif
}
- if (depth == 32)
+ if (depth == 32)
{
#ifdef BUILD_CONVERT_32_RGB_8888
if ((rmask == 0x00ff0000) && (gmask == 0x0000ff00) && (bmask ==
0x000000ff))
@@ -541,7 +541,7 @@
}
#endif
}
- if (depth == 24)
+ if (depth == 24)
{
#ifdef BUILD_CONVERT_24_RGB_888
if ((rmask == 0x00ff0000) && (gmask == 0x0000ff00) && (bmask ==
0x000000ff))
@@ -559,7 +559,7 @@
#endif
}
printf("depth = %i mode = %i\n", depth, pal_mode);
- if (depth == 8)
+ if (depth == 8)
{
#ifdef BUILD_CONVERT_8_RGB_332
if (pal_mode == PAL_MODE_RGB332)
@@ -590,10 +590,10 @@
return evas_common_convert_rgba_to_8bpp_rgb_111_dith;
#endif
}
- if (depth == 1)
+ if (depth == 1)
{
}
- if (depth == 4)
+ if (depth == 4)
{
}
}
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_cpu.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- evas_cpu.c 13 Aug 2007 12:13:03 -0000 1.32
+++ evas_cpu.c 19 Jul 2008 17:40:51 -0000 1.33
@@ -156,7 +156,7 @@
evas_common_cpu_have_cpuid(void)
{
return 0;
-/*
+/*
#ifdef BUILD_MMX
unsigned int have_cpu_id;
@@ -218,9 +218,9 @@
cpu_set_t cpu;
int i;
static int cpus = 0;
-
+
if (cpus != 0) return cpus;
-
+
sched_getaffinity(getpid(), sizeof(cpu), &cpu);
for (i = 0; i < TH_MAX; i++)
{
@@ -230,5 +230,5 @@
return cpus;
#else
return 1;
-#endif
+#endif
}
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_image_load.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- evas_image_load.c 3 Jun 2008 09:09:35 -0000 1.47
+++ evas_image_load.c 19 Jul 2008 17:40:51 -0000 1.48
@@ -42,14 +42,14 @@
dot = strrchr (ie->file, '.');
if (dot)
{
- for (i = 0, ++dot; i < (sizeof (loaders) / sizeof (struct
ext_loader_s)); ++i)
- {
- if (!strcasecmp (dot, loaders[i].extention))
- {
- loader = loaders[i].loader;
- break;
- }
- }
+ for (i = 0, ++dot; i < (sizeof (loaders) / sizeof (struct
ext_loader_s)); ++i)
+ {
+ if (!strcasecmp (dot, loaders[i].extention))
+ {
+ loader = loaders[i].loader;
+ break;
+ }
+ }
}
if (loader)
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_image_main.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- evas_image_main.c 10 Jul 2008 22:53:33 -0000 1.68
+++ evas_image_main.c 19 Jul 2008 17:40:51 -0000 1.69
@@ -93,14 +93,14 @@
//// printf("REF--=%i\n", reference);
// DISABLE for now - something wrong with cache shutdown freeing things
// still in use - rage_thumb segv's now.
-//
+//
// actually - i think i see it. cache ref goes to 0 (and thus gets freed)
// because in eng_setup() when a buffer changes size it is FIRST freed
// THEN allocated again - thus brignhjing ref to 0 then back to 1 immediately
// where it should stay at 1. - see evas_engine.c in the buffer enigne for
// example. eng_output_free() is called BEFORE _output_setup(). although this
// is only a SIGNE of the problem. we can patch this up with either freeing
-// after the setup (so we just pt a ref of 2 then back to 1), or just
+// after the setup (so we just pt a ref of 2 then back to 1), or just
// evas_common_image_init() at the start and evas_common_image_shutdown()
// after it all. really ref 0 should only be reached when no more canvases
// with no more objects exist anywhere.
@@ -160,12 +160,12 @@
if (im->image.data == NULL) return -1;
#ifdef HAVE_VALGRIND
-# ifdef VALGRIND_MAKE_READABLE
+# ifdef VALGRIND_MAKE_READABLE
VALGRIND_MAKE_READABLE(im->image.data, siz);
-# else
-# ifdef VALGRIND_MAKE_MEM_DEFINED
+# else
+# ifdef VALGRIND_MAKE_MEM_DEFINED
VALGRIND_MAKE_MEM_DEFINED(im->image.data, siz);
-# endif
+# endif
# endif
#endif
@@ -320,8 +320,8 @@
/* { */
/* if ((is->data) && (!is->no_free)) */
/* { */
-/* free(is->data); */
-/* is->data = NULL; */
+/* free(is->data); */
+/* is->data = NULL; */
/* } */
/* } */
@@ -437,7 +437,7 @@
if (len < EVAS_RGBA_LINE_BUFFER_MIN_LEN)
len = EVAS_RGBA_LINE_BUFFER_MIN_LEN;
return evas_common_image_create(len, 1);
-/*
+/*
if (evas_rgba_line_buffer)
{
if (evas_rgba_line_buffer->image->w >= len)
@@ -462,7 +462,7 @@
evas_common_image_line_buffer_release(RGBA_Image *im)
{
_evas_common_rgba_image_delete(&im->cache_entry);
-/*
+/*
if (!evas_rgba_line_buffer) return;
if (EVAS_RGBA_LINE_BUFFER_MAX_LEN < evas_rgba_line_buffer->image->w)
{
@@ -482,7 +482,7 @@
evas_common_image_line_buffer_free(RGBA_Image *im)
{
_evas_common_rgba_image_delete(&im->cache_entry);
-/*
+/*
if (!evas_rgba_line_buffer) return;
evas_common_image_free(evas_rgba_line_buffer);
evas_rgba_line_buffer = NULL;
@@ -496,7 +496,7 @@
if (len < EVAS_ALPHA_LINE_BUFFER_MIN_LEN)
len = EVAS_ALPHA_LINE_BUFFER_MIN_LEN;
return evas_common_image_alpha_create(len, 1);
-/*
+/*
if (evas_alpha_line_buffer)
{
if (evas_alpha_line_buffer->image->w >= len)
@@ -520,7 +520,7 @@
evas_common_image_alpha_line_buffer_release(RGBA_Image *im)
{
_evas_common_rgba_image_delete(&im->cache_entry);
-/*
+/*
if (!evas_alpha_line_buffer) return;
if (EVAS_ALPHA_LINE_BUFFER_MAX_LEN < evas_alpha_line_buffer->image->w)
{
@@ -552,7 +552,7 @@
{
DATA32 a = 1 + (*s >> 24);
- *s = (*s & 0xff000000) + (((((*s) >> 8) & 0xff) * a) & 0xff00) +
+ *s = (*s & 0xff000000) + (((((*s) >> 8) & 0xff) * a) & 0xff00) +
(((((*s) & 0x00ff00ff) * a) >> 8) & 0x00ff00ff);
s++;
if ((a == 1) || (a == 256))
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_image_save.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evas_image_save.c 18 Sep 2006 09:40:29 -0000 1.6
+++ evas_image_save.c 19 Jul 2008 17:40:51 -0000 1.7
@@ -13,12 +13,12 @@
Evas_Image_Save_Func *evas_image_save_func = NULL;
char *p;
char *saver = NULL;
-
+
p = strrchr(file, '.');
if (p)
{
p++;
-
+
if (!strcasecmp(p, "png"))
saver = "png";
if ((!strcasecmp(p, "jpg")) || (!strcasecmp(p, "jpeg")) ||
@@ -34,7 +34,7 @@
if (saver)
{
Evas_Module *em;
-
+
em = evas_module_find_type(EVAS_MODULE_TYPE_IMAGE_SAVER, saver);
if (em)
{
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_line_main.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- evas_line_main.c 1 Jun 2008 00:40:58 -0000 1.20
+++ evas_line_main.c 19 Jul 2008 17:40:51 -0000 1.21
@@ -160,14 +160,14 @@
if (dx < 0)
{
int tmp = x1;
-
+
x1 = x0;
x0 = tmp;
}
-
+
if (x0 < lx) x0 = lx;
if (x1 > rx) x1 = rx;
-
+
len = x1 - x0 + 1;
p = dst->image.data + (dstw * y0) + x0;
sfunc = evas_common_gfx_func_composite_color_span_get(color,
dst, len, dc->render_op);
@@ -187,7 +187,7 @@
{
if (y0 < ty) y0 = ty;
if (y1 > by) y1 = by;
-
+
len = y1 - y0 + 1;
p = dst->image.data + (dstw * y0) + x0;
while (len--)
@@ -208,7 +208,7 @@
{
int p0_in, p1_in;
- p0_in = (IN_RECT(x0, y0, clx, cly, clw, clh) ? 1 : 0);
+ p0_in = (IN_RECT(x0, y0, clx, cly, clw, clh) ? 1 : 0);
p1_in = (IN_RECT(x1, y1, clx, cly, clw, clh) ? 1 : 0);
if (dx > 0)
@@ -611,9 +611,9 @@
if ((unsigned)(px) < clw)
{
aa = ((yy - (y << 16)) >> 8);
- if ((unsigned)(py) < clh)
+ if ((unsigned)(py) < clh)
pfunc(0, 255 - aa, color, p);
- if ((unsigned)(py + 1) < clh)
+ if ((unsigned)(py + 1) < clh)
pfunc(0, aa, color, p + dstw);
}
yy += dyy;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_add_main_.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_op_add_main_.c 3 Jun 2008 09:09:35 -0000 1.3
+++ evas_op_add_main_.c 19 Jul 2008 17:40:51 -0000 1.4
@@ -18,13 +18,13 @@
static RGBA_Gfx_Pt_Func op_add_mask_color_pt_get(DATA32 col, RGBA_Image *dst);
static RGBA_Gfx_Pt_Func op_add_pixel_mask_pt_get(Image_Entry_Flags src_flags,
RGBA_Image *dst);
-static RGBA_Gfx_Compositor _composite_add = { "add",
+static RGBA_Gfx_Compositor _composite_add = { "add",
op_add_init, op_add_shutdown,
- op_add_pixel_span_get, op_add_color_span_get,
- op_add_pixel_color_span_get, op_add_mask_color_span_get,
+ op_add_pixel_span_get, op_add_color_span_get,
+ op_add_pixel_color_span_get, op_add_mask_color_span_get,
op_add_pixel_mask_span_get,
- op_add_pixel_pt_get, op_add_color_pt_get,
- op_add_pixel_color_pt_get, op_add_mask_color_pt_get,
+ op_add_pixel_pt_get, op_add_color_pt_get,
+ op_add_pixel_color_pt_get, op_add_mask_color_pt_get,
op_add_pixel_mask_pt_get
};
@@ -52,13 +52,13 @@
static RGBA_Gfx_Pt_Func op_add_rel_mask_color_pt_get(DATA32 col, RGBA_Image
*dst);
static RGBA_Gfx_Pt_Func op_add_rel_pixel_mask_pt_get(Image_Entry_Flags
src_flags, RGBA_Image *dst);
-static RGBA_Gfx_Compositor _composite_add_rel = { "add_rel",
+static RGBA_Gfx_Compositor _composite_add_rel = { "add_rel",
op_add_rel_init, op_add_rel_shutdown,
- op_add_rel_pixel_span_get, op_add_rel_color_span_get,
- op_add_rel_pixel_color_span_get, op_add_rel_mask_color_span_get,
+ op_add_rel_pixel_span_get, op_add_rel_color_span_get,
+ op_add_rel_pixel_color_span_get, op_add_rel_mask_color_span_get,
op_add_rel_pixel_mask_span_get,
- op_add_rel_pixel_pt_get, op_add_rel_color_pt_get,
- op_add_rel_pixel_color_pt_get, op_add_rel_mask_color_pt_get,
+ op_add_rel_pixel_pt_get, op_add_rel_color_pt_get,
+ op_add_rel_pixel_color_pt_get, op_add_rel_mask_color_pt_get,
op_add_rel_pixel_mask_pt_get
};
@@ -216,7 +216,7 @@
return add_gfx_span_func_cpu(s, m, c, d);
}
-static RGBA_Gfx_Pt_Func
+static RGBA_Gfx_Pt_Func
add_gfx_pt_func_cpu(int s, int m, int c, int d)
{
RGBA_Gfx_Pt_Func func = NULL;
@@ -446,7 +446,7 @@
return add_rel_gfx_span_func_cpu(s, m, c, d);
}
-static RGBA_Gfx_Pt_Func
+static RGBA_Gfx_Pt_Func
add_rel_gfx_pt_func_cpu(int s, int m, int c, int d)
{
RGBA_Gfx_Pt_Func func = NULL;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_blend_main_.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_op_blend_main_.c 3 Jun 2008 09:09:35 -0000 1.4
+++ evas_op_blend_main_.c 19 Jul 2008 17:40:51 -0000 1.5
@@ -18,13 +18,13 @@
static RGBA_Gfx_Pt_Func op_blend_mask_color_pt_get(DATA32 col, RGBA_Image
*dst);
static RGBA_Gfx_Pt_Func op_blend_pixel_mask_pt_get(Image_Entry_Flags
src_flags, RGBA_Image *dst);
-static RGBA_Gfx_Compositor _composite_blend = { "blend",
+static RGBA_Gfx_Compositor _composite_blend = { "blend",
op_blend_init, op_blend_shutdown,
- op_blend_pixel_span_get, op_blend_color_span_get,
- op_blend_pixel_color_span_get, op_blend_mask_color_span_get,
+ op_blend_pixel_span_get, op_blend_color_span_get,
+ op_blend_pixel_color_span_get, op_blend_mask_color_span_get,
op_blend_pixel_mask_span_get,
- op_blend_pixel_pt_get, op_blend_color_pt_get,
- op_blend_pixel_color_pt_get, op_blend_mask_color_pt_get,
+ op_blend_pixel_pt_get, op_blend_color_pt_get,
+ op_blend_pixel_color_pt_get, op_blend_mask_color_pt_get,
op_blend_pixel_mask_pt_get
};
@@ -53,13 +53,13 @@
static RGBA_Gfx_Pt_Func op_blend_rel_mask_color_pt_get(DATA32 col, RGBA_Image
*dst);
static RGBA_Gfx_Pt_Func op_blend_rel_pixel_mask_pt_get(Image_Entry_Flags
src_flags, RGBA_Image *dst);
-static RGBA_Gfx_Compositor _composite_blend_rel = { "blend_rel",
- op_blend_rel_init, op_blend_rel_shutdown,
- op_blend_rel_pixel_span_get, op_blend_rel_color_span_get,
- op_blend_rel_pixel_color_span_get, op_blend_rel_mask_color_span_get,
+static RGBA_Gfx_Compositor _composite_blend_rel = { "blend_rel",
+ op_blend_rel_init, op_blend_rel_shutdown,
+ op_blend_rel_pixel_span_get, op_blend_rel_color_span_get,
+ op_blend_rel_pixel_color_span_get, op_blend_rel_mask_color_span_get,
op_blend_rel_pixel_mask_span_get,
- op_blend_rel_pixel_pt_get, op_blend_rel_color_pt_get,
- op_blend_rel_pixel_color_pt_get, op_blend_rel_mask_color_pt_get,
+ op_blend_rel_pixel_pt_get, op_blend_rel_color_pt_get,
+ op_blend_rel_pixel_color_pt_get, op_blend_rel_mask_color_pt_get,
op_blend_rel_pixel_mask_pt_get
};
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_copy_main_.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_op_copy_main_.c 3 Jun 2008 09:09:35 -0000 1.4
+++ evas_op_copy_main_.c 19 Jul 2008 17:40:51 -0000 1.5
@@ -18,13 +18,13 @@
static RGBA_Gfx_Pt_Func op_copy_mask_color_pt_get(DATA32 col, RGBA_Image *dst);
static RGBA_Gfx_Pt_Func op_copy_pixel_mask_pt_get(Image_Entry_Flags src_flags,
RGBA_Image *dst);
-static RGBA_Gfx_Compositor _composite_copy = { "copy",
- op_copy_init, op_copy_shutdown,
- op_copy_pixel_span_get, op_copy_color_span_get,
- op_copy_pixel_color_span_get, op_copy_mask_color_span_get,
- op_copy_pixel_mask_span_get,
- op_copy_pixel_pt_get, op_copy_color_pt_get,
- op_copy_pixel_color_pt_get, op_copy_mask_color_pt_get,
+static RGBA_Gfx_Compositor _composite_copy = { "copy",
+ op_copy_init, op_copy_shutdown,
+ op_copy_pixel_span_get, op_copy_color_span_get,
+ op_copy_pixel_color_span_get, op_copy_mask_color_span_get,
+ op_copy_pixel_mask_span_get,
+ op_copy_pixel_pt_get, op_copy_color_pt_get,
+ op_copy_pixel_color_pt_get, op_copy_mask_color_pt_get,
op_copy_pixel_mask_pt_get
};
@@ -53,13 +53,13 @@
static RGBA_Gfx_Pt_Func op_copy_rel_mask_color_pt_get(DATA32 col, RGBA_Image
*dst);
static RGBA_Gfx_Pt_Func op_copy_rel_pixel_mask_pt_get(Image_Entry_Flags
src_flags, RGBA_Image *dst);
-static RGBA_Gfx_Compositor _composite_copy_rel = { "copy_rel",
- op_copy_rel_init, op_copy_rel_shutdown,
- op_copy_rel_pixel_span_get, op_copy_rel_color_span_get,
- op_copy_rel_pixel_color_span_get, op_copy_rel_mask_color_span_get,
- op_copy_rel_pixel_mask_span_get,
- op_copy_rel_pixel_pt_get, op_copy_color_pt_get,
- op_copy_rel_pixel_color_pt_get, op_copy_rel_mask_color_pt_get,
+static RGBA_Gfx_Compositor _composite_copy_rel = { "copy_rel",
+ op_copy_rel_init, op_copy_rel_shutdown,
+ op_copy_rel_pixel_span_get, op_copy_rel_color_span_get,
+ op_copy_rel_pixel_color_span_get, op_copy_rel_mask_color_span_get,
+ op_copy_rel_pixel_mask_span_get,
+ op_copy_rel_pixel_pt_get, op_copy_color_pt_get,
+ op_copy_rel_pixel_color_pt_get, op_copy_rel_mask_color_pt_get,
op_copy_rel_pixel_mask_pt_get
};
@@ -233,7 +233,7 @@
return copy_gfx_span_func_cpu(s, m, c, d);
}
-static RGBA_Gfx_Pt_Func
+static RGBA_Gfx_Pt_Func
copy_gfx_pt_func_cpu(int s, int m, int c, int d)
{
RGBA_Gfx_Pt_Func func = NULL;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_mask_main_.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_op_mask_main_.c 3 Jun 2008 09:09:35 -0000 1.3
+++ evas_op_mask_main_.c 19 Jul 2008 17:40:51 -0000 1.4
@@ -18,13 +18,13 @@
static RGBA_Gfx_Pt_Func op_mask_mask_color_pt_get(DATA32 col, RGBA_Image *dst);
static RGBA_Gfx_Pt_Func op_mask_pixel_mask_pt_get(Image_Entry_Flags src_flags,
RGBA_Image *dst);
-static RGBA_Gfx_Compositor _composite_mask = { "mask",
+static RGBA_Gfx_Compositor _composite_mask = { "mask",
op_mask_init, op_mask_shutdown,
- op_mask_pixel_span_get, op_mask_color_span_get,
- op_mask_pixel_color_span_get, op_mask_mask_color_span_get,
+ op_mask_pixel_span_get, op_mask_color_span_get,
+ op_mask_pixel_color_span_get, op_mask_mask_color_span_get,
op_mask_pixel_mask_span_get,
- op_mask_pixel_pt_get, op_mask_color_pt_get,
- op_mask_pixel_color_pt_get, op_mask_mask_color_pt_get,
+ op_mask_pixel_pt_get, op_mask_color_pt_get,
+ op_mask_pixel_color_pt_get, op_mask_mask_color_pt_get,
op_mask_pixel_mask_pt_get
};
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_mul_main_.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_op_mul_main_.c 3 Jun 2008 09:09:35 -0000 1.3
+++ evas_op_mul_main_.c 19 Jul 2008 17:40:51 -0000 1.4
@@ -18,13 +18,13 @@
static RGBA_Gfx_Pt_Func op_mul_mask_color_pt_get(DATA32 col, RGBA_Image *dst);
static RGBA_Gfx_Pt_Func op_mul_pixel_mask_pt_get(Image_Entry_Flags src_flags,
RGBA_Image *dst);
-static RGBA_Gfx_Compositor _composite_mul = { "mul",
+static RGBA_Gfx_Compositor _composite_mul = { "mul",
op_mul_init, op_mul_shutdown,
- op_mul_pixel_span_get, op_mul_color_span_get,
- op_mul_pixel_color_span_get, op_mul_mask_color_span_get,
+ op_mul_pixel_span_get, op_mul_color_span_get,
+ op_mul_pixel_color_span_get, op_mul_mask_color_span_get,
op_mul_pixel_mask_span_get,
- op_mul_pixel_pt_get, op_mul_color_pt_get,
- op_mul_pixel_color_pt_get, op_mul_mask_color_pt_get,
+ op_mul_pixel_pt_get, op_mul_color_pt_get,
+ op_mul_pixel_color_pt_get, op_mul_mask_color_pt_get,
op_mul_pixel_mask_pt_get
};
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_sub_main_.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_op_sub_main_.c 3 Jun 2008 09:09:35 -0000 1.3
+++ evas_op_sub_main_.c 19 Jul 2008 17:40:51 -0000 1.4
@@ -18,13 +18,13 @@
static RGBA_Gfx_Pt_Func op_sub_mask_color_pt_get(DATA32 col, RGBA_Image *dst);
static RGBA_Gfx_Pt_Func op_sub_pixel_mask_pt_get(Image_Entry_Flags src_flags,
RGBA_Image *dst);
-static RGBA_Gfx_Compositor _composite_sub = { "sub",
+static RGBA_Gfx_Compositor _composite_sub = { "sub",
op_sub_init, op_sub_shutdown,
- op_sub_pixel_span_get, op_sub_color_span_get,
- op_sub_pixel_color_span_get, op_sub_mask_color_span_get,
+ op_sub_pixel_span_get, op_sub_color_span_get,
+ op_sub_pixel_color_span_get, op_sub_mask_color_span_get,
op_sub_pixel_mask_span_get,
- op_sub_pixel_pt_get, op_sub_color_pt_get,
- op_sub_pixel_color_pt_get, op_sub_mask_color_pt_get,
+ op_sub_pixel_pt_get, op_sub_color_pt_get,
+ op_sub_pixel_color_pt_get, op_sub_mask_color_pt_get,
op_sub_pixel_mask_pt_get
};
@@ -52,13 +52,13 @@
static RGBA_Gfx_Pt_Func op_sub_rel_mask_color_pt_get(DATA32 col, RGBA_Image
*dst);
static RGBA_Gfx_Pt_Func op_sub_rel_pixel_mask_pt_get(Image_Entry_Flags
src_flags, RGBA_Image *dst);
-static RGBA_Gfx_Compositor _composite_sub_rel = { "sub_rel",
+static RGBA_Gfx_Compositor _composite_sub_rel = { "sub_rel",
op_sub_rel_init, op_sub_rel_shutdown,
- op_sub_rel_pixel_span_get, op_sub_rel_color_span_get,
- op_sub_rel_pixel_color_span_get, op_sub_rel_mask_color_span_get,
+ op_sub_rel_pixel_span_get, op_sub_rel_color_span_get,
+ op_sub_rel_pixel_color_span_get, op_sub_rel_mask_color_span_get,
op_sub_rel_pixel_mask_span_get,
- op_sub_rel_pixel_pt_get, op_sub_rel_color_pt_get,
- op_sub_rel_pixel_color_pt_get, op_sub_rel_mask_color_pt_get,
+ op_sub_rel_pixel_pt_get, op_sub_rel_color_pt_get,
+ op_sub_rel_pixel_color_pt_get, op_sub_rel_mask_color_pt_get,
op_sub_rel_pixel_mask_pt_get
};
@@ -216,7 +216,7 @@
return sub_gfx_span_func_cpu(s, m, c, d);
}
-static RGBA_Gfx_Pt_Func
+static RGBA_Gfx_Pt_Func
sub_gfx_pt_func_cpu(int s, int m, int c, int d)
{
RGBA_Gfx_Pt_Func func = NULL;
@@ -446,7 +446,7 @@
return sub_rel_gfx_span_func_cpu(s, m, c, d);
}
-static RGBA_Gfx_Pt_Func
+static RGBA_Gfx_Pt_Func
sub_rel_gfx_pt_func_cpu(int s, int m, int c, int d)
{
RGBA_Gfx_Pt_Func func = NULL;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_scale_sample.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- evas_scale_sample.c 11 Jul 2008 06:36:30 -0000 1.13
+++ evas_scale_sample.c 19 Jul 2008 17:40:51 -0000 1.14
@@ -237,7 +237,7 @@
/* figure out dest start ptr */
dst_ptr = dst_data + dst_clip_x + (dst_clip_y * dst_w);
-
+
if (dc->mul.use)
func = evas_common_gfx_func_composite_pixel_color_span_get(src,
dc->mul.col, dst, dst_clip_w, dc->render_op);
else
@@ -269,7 +269,7 @@
+ src_region_y) * src_w);
/* scale to dst */
dptr = dst_ptr;
-#ifdef DIRECT_SCALE
+#ifdef DIRECT_SCALE
if ((!src->cache_entry.flags.alpha) &&
(!dst->cache_entry.flags.alpha) &&
(!dc->mul.use))
@@ -292,7 +292,7 @@
}
}
else
-#endif
+#endif
{
/* a scanline buffer */
buf = alloca(dst_clip_w * sizeof(DATA32));
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/lib/engines/common/evas_scale_smooth_scaler.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- evas_scale_smooth_scaler.c 12 Apr 2008 00:32:25 -0000 1.13
+++ evas_scale_smooth_scaler.c 19 Jul 2008 17:40:52 -0000 1.14
@@ -9,7 +9,7 @@
DATA32 *dst_ptr;
int dst_jump;
int dst_clip_x, dst_clip_y, dst_clip_w, dst_clip_h;
- int src_w, src_h, dst_w, dst_h;
+ int src_w, src_h, dst_w, dst_h;
if (!(RECTS_INTERSECT(dst_region_x, dst_region_y, dst_region_w,
dst_region_h, 0, 0, dst->cache_entry.w, dst->cache_entry.h)))
return;
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/lib/engines/common/evas_scale_smooth_scaler_down.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_scale_smooth_scaler_down.c 12 Apr 2008 00:32:25 -0000 1.8
+++ evas_scale_smooth_scaler_down.c 19 Jul 2008 17:40:52 -0000 1.9
@@ -4,7 +4,7 @@
int *xapoints, *xapp;
int *yapoints, *yapp;
DATA32 *buf, *src_data;
-
+
RGBA_Gfx_Func func;
src_data = src->image.data;
@@ -15,10 +15,10 @@
yapoints = scale_calc_a_points(src_region_h, dst_region_h);
if ( (!xpoints) || (!ypoints) || (!xapoints) || (!yapoints) )
goto done_scale_down;
-
+
/* a scanline buffer */
buf = alloca(dst_clip_w * sizeof(DATA32));
-
+
if (dc->mul.use)
func = evas_common_gfx_func_composite_pixel_color_span_get(src,
dc->mul.col, dst, dst_clip_w, dc->render_op);
else
@@ -41,7 +41,7 @@
{
#include "evas_scale_smooth_scaler_downx_downy.c"
}
-
+
done_scale_down:
if (xpoints) free(xpoints);
if (ypoints) free(ypoints);
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_scale_smooth_scaler_downx.c 3 Jun 2008 09:09:35 -0000 1.7
+++ evas_scale_smooth_scaler_downx.c 19 Jul 2008 17:40:52 -0000 1.8
@@ -8,12 +8,12 @@
#ifdef EVAS_SLI
int ysli = dst_clip_y;
#endif
-
+
dptr = dst_ptr;
pos = (src_region_y * src_w) + src_region_x;
dyy = dst_clip_y - dst_region_y;
dxx = dst_clip_x - dst_region_x;
-
+
xp = xpoints + dxx;
yp = ypoints + dyy;
xapp = xapoints + dxx;
@@ -33,7 +33,7 @@
Cx = *xapp >> 16;
xap = *xapp & 0xffff;
pix = *yp + *xp + pos;
-
+
a = (A_VAL(pix) * xap) >> 10;
r = (R_VAL(pix) * xap) >> 10;
g = (G_VAL(pix) * xap) >> 10;
@@ -85,7 +85,7 @@
*pbuf++ = ARGB_JOIN(a >> 4, r >> 4, g >> 4, b >> 4);
xp++; xapp++;
}
-
+
func(buf, NULL, dc->mul.col, dptr, w);
}
#ifdef EVAS_SLI
@@ -117,7 +117,7 @@
Cx = *xapp >> 16;
xap = *xapp & 0xffff;
pix = *yp + *xp + pos;
-
+
r = (R_VAL(pix) * xap) >> 10;
g = (G_VAL(pix) * xap) >> 10;
b = (B_VAL(pix) * xap) >> 10;
@@ -166,7 +166,7 @@
#ifdef EVAS_SLI
ysli++;
#endif
-
+
dptr += dst_w; dst_clip_w = w;
yp++; yapp++;
xp = xpoints + dxx;
@@ -174,7 +174,7 @@
}
}
else
-#endif
+#endif
{
while (dst_clip_h--)
{
@@ -187,7 +187,7 @@
Cx = *xapp >> 16;
xap = *xapp & 0xffff;
pix = *yp + *xp + pos;
-
+
r = (R_VAL(pix) * xap) >> 10;
g = (G_VAL(pix) * xap) >> 10;
b = (B_VAL(pix) * xap) >> 10;
@@ -232,13 +232,13 @@
*pbuf++ = ARGB_JOIN(0xff, r >> 4, g >> 4, b >> 4);
xp++; xapp++;
}
-
+
func(buf, NULL, dc->mul.col, dptr, w);
}
#ifdef EVAS_SLI
ysli++;
#endif
-
+
pbuf = buf;
dptr += dst_w; dst_clip_w = w;
yp++; yapp++;
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/lib/engines/common/evas_scale_smooth_scaler_downy.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_scale_smooth_scaler_downy.c 3 Jun 2008 09:09:35 -0000 1.7
+++ evas_scale_smooth_scaler_downy.c 19 Jul 2008 17:40:52 -0000 1.8
@@ -8,7 +8,7 @@
#ifdef EVAS_SLI
int ysli = dst_clip_y;
#endif
-
+
dptr = dst_ptr;
pos = (src_region_y * src_w) + src_region_x;
dyy = dst_clip_y - dst_region_y;
@@ -30,11 +30,11 @@
{
Cy = *yapp >> 16;
yap = *yapp & 0xffff;
-
+
while (dst_clip_w--)
{
pix = *yp + *xp + pos;
-
+
a = (A_VAL(pix) * yap) >> 10;
r = (R_VAL(pix) * yap) >> 10;
g = (G_VAL(pix) * yap) >> 10;
@@ -86,7 +86,7 @@
*pbuf++ = ARGB_JOIN(a >> 4, r >> 4, g >> 4, b >> 4);
xp++; xapp++;
}
-
+
func(buf, NULL, dc->mul.col, dptr, w);
}
#ifdef EVAS_SLI
@@ -114,12 +114,12 @@
{
Cy = *yapp >> 16;
yap = *yapp & 0xffff;
-
+
pbuf = dptr;
while (dst_clip_w--)
{
pix = *yp + *xp + pos;
-
+
r = (R_VAL(pix) * yap) >> 10;
g = (G_VAL(pix) * yap) >> 10;
b = (B_VAL(pix) * yap) >> 10;
@@ -175,7 +175,7 @@
}
}
else
-#endif
+#endif
{
while (dst_clip_h--)
{
@@ -185,11 +185,11 @@
{
Cy = *yapp >> 16;
yap = *yapp & 0xffff;
-
+
while (dst_clip_w--)
{
pix = *yp + *xp + pos;
-
+
r = (R_VAL(pix) * yap) >> 10;
g = (G_VAL(pix) * yap) >> 10;
b = (B_VAL(pix) * yap) >> 10;
@@ -234,7 +234,7 @@
*pbuf++ = ARGB_JOIN(0xff, r >> 4, g >> 4, b >> 4);
xp++; xapp++;
}
-
+
func(buf, NULL, dc->mul.col, dptr, w);
}
#ifdef EVAS_SLI
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/lib/engines/common/evas_scale_smooth_scaler_noscale.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_scale_smooth_scaler_noscale.c 12 Apr 2008 00:32:25 -0000 1.8
+++ evas_scale_smooth_scaler_noscale.c 19 Jul 2008 17:40:52 -0000 1.9
@@ -4,7 +4,7 @@
#ifdef EVAS_SLI
int ysli = dst_clip_y;
#endif
-
+
ptr = src->image.data + ((dst_clip_y - dst_region_y + src_region_y) *
src_w) + (dst_clip_x - dst_region_x) + src_region_x;
if (dc->mul.use)
func = evas_common_gfx_func_composite_pixel_color_span_get(src,
dc->mul.col, dst, dst_clip_w, dc->render_op);
@@ -20,7 +20,7 @@
}
#ifdef EVAS_SLI
ysli++;
-#endif
+#endif
ptr += src_w;
dst_ptr += dst_w;
}
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/lib/engines/common/evas_scale_smooth_scaler_up.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- evas_scale_smooth_scaler_up.c 3 Jun 2008 09:09:35 -0000 1.14
+++ evas_scale_smooth_scaler_up.c 19 Jul 2008 17:40:52 -0000 1.15
@@ -78,7 +78,7 @@
{
DATA32 p0, p1;
int ax;
-
+
sx = (sxx >> 16);
ax = 1 + ((sxx - (sx << 16)) >> 8);
p0 = p1 = *(psrc + sx);
@@ -107,7 +107,7 @@
}
#ifdef EVAS_SLI
ysli++;
-#endif
+#endif
pdst += dst_w;
psrc += src_w;
buf += buf_step;
@@ -129,7 +129,7 @@
#endif
{
int ay;
-
+
sy = syy >> 16;
psrc = ps + (sy * src_w);
ay = 1 + ((syy - (sy << 16)) >> 8);
@@ -142,7 +142,7 @@
while (pbuf < pbuf_end)
{
DATA32 p0 = *psrc, p2 = p0;
-
+
if ((sy + 1) < srh)
p2 = *(psrc + src_w);
#ifdef SCALE_USING_MMX
@@ -167,7 +167,7 @@
}
#ifdef EVAS_SLI
ysli++;
-#endif
+#endif
pdst += dst_w;
syy += dsyy;
buf += buf_step;
@@ -189,7 +189,7 @@
#endif
{
int ay;
-
+
sy = syy >> 16;
psrc = ps + (sy * src_w);
ay = 1 + ((syy - (sy << 16)) >> 8);
@@ -205,7 +205,7 @@
int ax;
DATA32 *p, *q;
DATA32 p0, p1, p2, p3;
-
+
sx = sxx >> 16;
ax = 1 + ((sxx - (sx << 16)) >> 8);
p = psrc + sx; q = p + src_w;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_tiler.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- evas_tiler.c 19 Aug 2007 06:21:23 -0000 1.17
+++ evas_tiler.c 19 Jul 2008 17:40:52 -0000 1.18
@@ -82,13 +82,13 @@
rect_init(rect_t *r, int x, int y, int w, int h)
{
r->area = w * h;
-
+
r->left = x;
r->top = y;
-
+
r->right = x + w;
r->bottom = y + h;
-
+
r->width = w;
r->height = h;
}
@@ -104,10 +104,10 @@
{
list_node_t *node;
int len;
-
+
len = 0;
for (node = rects.head; node != NULL; node = node->next) len++;
-
+
printf("[");
for (node = rects.head; node != NULL; node = node->next)
{
@@ -145,11 +145,11 @@
rect_list_append(list_t *rects, const rect_t r)
{
rect_node_t *rect_node;
-
+
rect_node = (rect_node_t *)rect_list_node_pool_get();
rect_node->rect = r;
rect_node->_lst = list_node_zeroed;
-
+
rect_list_append_node(rects, (list_node_t *)rect_node);
}
@@ -157,7 +157,7 @@
rect_list_append_xywh(list_t *rects, int x, int y, int w, int h)
{
rect_t r;
-
+
rect_init(&r, x, y, w, h);
rect_list_append(rects, r);
}
@@ -167,7 +167,7 @@
{
if (!other->head)
return;
-
+
if (rects->tail)
{
rects->tail->next = other->head;
@@ -196,7 +196,7 @@
node = rects->head;
rects->head = node->next;
}
-
+
if (rects->tail == node) rects->tail = parent_node;
*node = list_node_zeroed;
return node;
@@ -215,12 +215,12 @@
rect_list_clear(list_t *rects)
{
list_node_t *node;
-
+
node = rects->head;
while (node)
{
list_node_t *aux;
-
+
aux = node->next;
rect_list_node_pool_put(node);
node = aux;
@@ -232,21 +232,21 @@
_calc_intra_rect_area(const rect_t a, const rect_t b, int *width, int *height)
{
int max_left, min_right, max_top, min_bottom;
-
+
if (a.left < b.left) max_left = b.left;
else max_left = a.left;
-
+
if (a.right < b.right) min_right = a.right;
else min_right = b.right;
-
+
*width = min_right - max_left;
-
+
if (a.top < b.top) max_top = b.top;
else max_top = a.top;
-
+
if (a.bottom < b.bottom) min_bottom = a.bottom;
else min_bottom = b.bottom;
-
+
*height = min_bottom - max_top;
}
@@ -254,12 +254,12 @@
_split_strict(list_t *dirty, const rect_t current, rect_t r)
{
int h_1, h_2, w_1, w_2;
-
+
h_1 = current.top - r.top;
h_2 = r.bottom - current.bottom;
w_1 = current.left - r.left;
w_2 = r.right - current.right;
-
+
if (h_1 > 0)
{
/* .--.r (b) .---.r2
@@ -273,7 +273,7 @@
r.height -= h_1;
r.top = current.top;
}
-
+
if (h_2 > 0)
{
/* .-------.cur (a)
@@ -286,7 +286,7 @@
rect_list_append_xywh(dirty, r.left, current.bottom, r.width, h_2);
r.height -= h_2;
}
-
+
if (w_1 > 0)
{
/* (b) r .----.cur (a)
@@ -300,7 +300,7 @@
/* r.width -= w_1; */
/* r.left = current.left; */
}
-
+
if (w_2 > 0)
{
/* .----.cur (a)
@@ -321,16 +321,16 @@
{
list_t modified = list_zeroed;
list_node_t *cur_node, *prev_node;
-
+
prev_node = NULL;
cur_node = rects->head;
while (cur_node)
{
int intra_width, intra_height;
rect_t current;
-
+
current = ((rect_node_t*)cur_node)->rect;
-
+
_calc_intra_rect_area(del_r, current, &intra_width, &intra_height);
if ((intra_width <= 0) || (intra_height <= 0))
{
@@ -374,33 +374,33 @@
list_t dirty = list_zeroed;
list_t new_dirty = list_zeroed;
list_node_t *cur_node;
-
+
if (!rects->head)
{
rect_list_append_node(rects, node);
return;
}
-
+
rect_list_append_node(&dirty, node);
-
+
cur_node = rects->head;
while (dirty.head)
{
rect_t current;
-
+
if (!cur_node)
{
rect_list_concat(rects, &dirty);
break;
}
-
+
current = ((rect_node_t*)cur_node)->rect;
-
+
while (dirty.head)
{
int intra_width, intra_height;
rect_t r;
-
+
r = ((rect_node_t *)dirty.head)->rect;
_calc_intra_rect_area(r, current, &intra_width, &intra_height);
if ((intra_width == r.width) && (intra_height == r.height))
@@ -423,7 +423,7 @@
tmp = rect_list_unlink_next(&dirty, NULL);
rect_list_append_node(&new_dirty, tmp);
}
- else
+ else
{
_split_strict(&new_dirty, current, r);
rect_list_del_next(&dirty, NULL);
@@ -431,7 +431,7 @@
}
dirty = new_dirty;
new_dirty = list_zeroed;
-
+
cur_node = cur_node->next;
}
}
@@ -453,7 +453,7 @@
max_left = a.left;
min_left = b.left;
}
-
+
if (a.right < b.right)
{
min_right = a.right;
@@ -464,15 +464,15 @@
min_right = b.right;
max_right = a.right;
}
-
+
intra->left = max_left;
intra->right = min_right;
intra->width = min_right - max_left;
-
+
outer->left = min_left;
outer->right = max_right;
outer->width = max_right - min_left;
-
+
if (a.top < b.top)
{
max_top = b.top;
@@ -483,7 +483,7 @@
max_top = a.top;
min_top = b.top;
}
-
+
if (a.bottom < b.bottom)
{
min_bottom = a.bottom;
@@ -502,7 +502,7 @@
intra->area = intra->width * intra->height;
else
intra->area = 0;
-
+
outer->top = min_top;
outer->bottom = max_bottom;
outer->height = max_bottom - min_top;
@@ -520,14 +520,14 @@
_split_fuzzy(list_t *dirty, const rect_t a, rect_t *b)
{
int h_1, h_2, w_1, w_2, action;
-
+
h_1 = a.top - b->top;
h_2 = b->bottom - a.bottom;
w_1 = a.left - b->left;
w_2 = b->right - a.right;
-
+
action = SPLIT_FUZZY_ACTION_NONE;
-
+
if (h_1 > 0)
{
/* .--.r (b) .---.r2
@@ -542,7 +542,7 @@
b->top = a.top;
action = SPLIT_FUZZY_ACTION_SPLIT;
}
-
+
if (h_2 > 0)
{
/* .-------.cur (a)
@@ -556,7 +556,7 @@
b->height -= h_2;
action = SPLIT_FUZZY_ACTION_SPLIT;
}
-
+
if (((w_1 > 0) || (w_2 > 0)) && (a.height == b->height))
return SPLIT_FUZZY_ACTION_MERGE;
@@ -574,7 +574,7 @@
/* b->left = a.left; */
action = SPLIT_FUZZY_ACTION_SPLIT;
}
-
+
if (w_2 > 0)
{
/* .----.cur (a)
@@ -589,7 +589,7 @@
/* b->width -= w_2; */
action = SPLIT_FUZZY_ACTION_SPLIT;
}
-
+
return action;
}
@@ -598,25 +598,25 @@
{
list_t dirty = list_zeroed;
list_node_t *old_last;
-
+
old_last = rects->tail;
-
+
if (!rects->head)
{
rect_list_append_node(rects, node);
return old_last;
}
-
+
rect_list_append_node(&dirty, node);
while (dirty.head)
{
list_node_t *d_node, *cur_node, *prev_cur_node;
int keep_dirty;
rect_t r;
-
+
d_node = rect_list_unlink_next(&dirty, NULL);
r = ((rect_node_t *)d_node)->rect;
-
+
prev_cur_node = NULL;
cur_node = rects->head;
keep_dirty = 1;
@@ -624,12 +624,12 @@
{
int area, action;
rect_t current, intra, outer;
-
+
current = ((rect_node_t *)cur_node)->rect;
-
+
_calc_intra_outer_rect_area(r, current, &intra, &outer);
area = current.area + r.area - intra.area;
-
+
if ((intra.width == r.width) && (intra.height == r.height))
{
/* .-------.cur
@@ -666,14 +666,14 @@
* merge them, remove both and add merged
*/
rect_node_t *n;
-
+
if (old_last == cur_node)
old_last = prev_cur_node;
-
+
n = (rect_node_t *)rect_list_unlink_next(rects,
prev_cur_node);
n->rect = outer;
rect_list_append_node(&dirty, (list_node_t *)n);
-
+
keep_dirty = 0;
break;
}
@@ -697,13 +697,13 @@
{
/* horizontal merge is possible: remove both, add merged
*/
rect_node_t *n;
-
+
if (old_last == cur_node)
old_last = prev_cur_node;
-
+
n = (rect_node_t *)
rect_list_unlink_next(rects, prev_cur_node);
-
+
n->rect.left = outer.left;
n->rect.width = outer.width;
n->rect.right = outer.right;
@@ -721,12 +721,12 @@
printf("Should not get here!\n");
abort();
}
-
+
keep_dirty = 0;
break;
}
}
-
+
if (UNLIKELY(keep_dirty)) rect_list_append_node(rects, d_node);
else rect_list_node_pool_put(d_node);
}
@@ -739,27 +739,27 @@
{
int min_left, max_right;
int min_top, max_bottom;
-
+
if (a.left < b.left) min_left = a.left;
else min_left = b.left;
-
+
if (a.right < b.right) max_right = b.right;
else max_right = a.right;
-
+
outer->left = min_left;
outer->right = max_right;
outer->width = max_right - min_left;
-
+
if (a.top < b.top) min_top = a.top;
else min_top = b.top;
-
+
if (a.bottom < b.bottom) max_bottom = b.bottom;
else max_bottom = a.bottom;
-
+
outer->top = min_top;
outer->bottom = max_bottom;
outer->height = max_bottom - min_top;
-
+
outer->area = outer->width * outer->height;
}
@@ -771,9 +771,9 @@
list_node_t *node, *parent_node;
rect_t r1;
int merged;
-
+
r1 = ((rect_node_t *)to_merge->head)->rect;
-
+
merged = 0;
parent_node = NULL;
node = rects->head;
@@ -781,9 +781,9 @@
{
rect_t r2, outer;
int area;
-
+
r2 = ((rect_node_t *)node)->rect;
-
+
_calc_outer_rect_area(r1, r2, &outer);
area = r1.area + r2.area; /* intra area is taken as 0 */
if (outer.area - area <= accepted_error)
@@ -793,18 +793,18 @@
* actually r3 uses r2 instance, saves memory
*/
rect_node_t *n;
-
+
n = (rect_node_t *)rect_list_unlink_next(rects, parent_node);
n->rect = outer;
rect_list_append_node(to_merge, (list_node_t *)n);
merged = 1;
break;
}
-
+
parent_node = node;
node = node->next;
}
-
+
if (!merged)
{
list_node_t *n;
@@ -823,18 +823,18 @@
int merge_accepted_error)
{
list_node_t *n;
-
+
n = rect_list_add_split_fuzzy(rects, node, split_accepted_error);
if (n && n->next)
{
list_t to_merge;
-
+
/* split list into 2 segments, already merged and to merge */
to_merge.head = n->next;
to_merge.tail = rects->tail;
rects->tail = n;
n->next = NULL;
-
+
rect_list_merge_rects(rects, &to_merge, merge_accepted_error);
}
}
@@ -991,7 +991,7 @@
evas_common_regionbuf_span_del(tb->rb, x, x + w - 1, y + i);
#elif defined(EVAS_RECT_SPLIT)
rect_t r;
-
+
if (!tb->rects.head) return 0;
if ((w <= 0) || (h <= 0)) return 0;
RECTS_CLIP_TO_RECT(x, y, w, h, 0, 0, tb->outbuf_w, tb->outbuf_h);
@@ -1005,7 +1005,7 @@
w >>= 1;
h -= 1;
h >>= 1;
-
+
if ((w <= 0) || (h <= 0)) return 0;
rect_init(&r, x, y, w, h);
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
