summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-08-19 16:12:29 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-08-19 16:12:29 +0200
commitc57cf86d6fa5df5029570c03ac6abe583f5e73f4 (patch)
tree02227801ca2ee36e7fc353d5a4dd55f281b715c0
parent7c83af2ae3c83d82b23e73115db1aad7f19bcecc (diff)
downloadefl-c57cf86d6fa5df5029570c03ac6abe583f5e73f4.tar.gz
ector: fix naming and forcing this inline function to be static.
-rw-r--r--src/lib/ector/software/ector_drawhelper.c6
-rw-r--r--src/lib/ector/software/ector_drawhelper_private.h6
-rw-r--r--src/lib/ector/software/ector_drawhelper_sse2.c6
3 files changed, 8 insertions, 10 deletions
diff --git a/src/lib/ector/software/ector_drawhelper.c b/src/lib/ector/software/ector_drawhelper.c
index f1ea66b591..eee1d7c92d 100644
--- a/src/lib/ector/software/ector_drawhelper.c
+++ b/src/lib/ector/software/ector_drawhelper.c
@@ -26,7 +26,7 @@ comp_func_solid_source_over(uint *dest, int length, uint color, uint const_alpha
int ialpha, i;
if (const_alpha != 255)
color = BYTE_MUL(color, const_alpha);
- ialpha = Alpha(~color);
+ ialpha = _alpha(~color);
for (i = 0; i < length; ++i)
dest[i] = color + BYTE_MUL(dest[i], ialpha);
}
@@ -49,7 +49,7 @@ comp_func_source_over(uint *dest, const uint *src, int length, uint color, uint
dest[i] = s;
else if (s != 0)
{
- sia = Alpha(~s);
+ sia = _alpha(~s);
dest[i] = s + BYTE_MUL(dest[i], sia);
}
}
@@ -60,7 +60,7 @@ comp_func_source_over(uint *dest, const uint *src, int length, uint color, uint
{
s = src[i];
sc = ECTOR_MUL4_SYM(color, s);
- sia = Alpha(~sc);
+ sia = _alpha(~sc);
dest[i] = sc + BYTE_MUL(dest[i], sia);
}
}
diff --git a/src/lib/ector/software/ector_drawhelper_private.h b/src/lib/ector/software/ector_drawhelper_private.h
index ea7776001a..a753987fc9 100644
--- a/src/lib/ector/software/ector_drawhelper_private.h
+++ b/src/lib/ector/software/ector_drawhelper_private.h
@@ -17,13 +17,11 @@
typedef unsigned int uint;
#endif
-inline int Alpha(uint c)
+static inline int _alpha(uint c)
{
return c>>24;
}
-
-
#define ECTOR_ARGB_JOIN(a,r,g,b) \
(((a) << 24) + ((r) << 16) + ((g) << 8) + (b))
@@ -99,4 +97,4 @@ void init_draw_helper();
RGBA_Comp_Func_Solid ector_comp_func_solid_span_get(Ector_Rop op, uint color);
RGBA_Comp_Func ector_comp_func_span_get(Ector_Rop op, uint color, Eina_Bool src_alpha);
-#endif \ No newline at end of file
+#endif
diff --git a/src/lib/ector/software/ector_drawhelper_sse2.c b/src/lib/ector/software/ector_drawhelper_sse2.c
index bf6b25cb27..581cbb7e21 100644
--- a/src/lib/ector/software/ector_drawhelper_sse2.c
+++ b/src/lib/ector/software/ector_drawhelper_sse2.c
@@ -157,7 +157,7 @@ comp_func_solid_source_over_sse2(uint *dest, int length, uint color, uint const_
int ialpha;
if (const_alpha != 255)
color = BYTE_MUL(color, const_alpha);
- ialpha = Alpha(~color);
+ ialpha = _alpha(~color);
comp_func_helper_sse2(dest, length, color, ialpha);
}
@@ -272,7 +272,7 @@ comp_func_source_over_sse2(uint *dest, const uint *src, int length, uint color,
LOOP_ALIGNED_U1_A4(dest, length,
{ /* UOP */
s = *src;
- sia = Alpha(~s);
+ sia = _alpha(~s);
*dest = s + BYTE_MUL(*dest, sia);
dest++; src++; length--;
},
@@ -289,7 +289,7 @@ comp_func_source_over_sse2(uint *dest, const uint *src, int length, uint color,
LOOP_ALIGNED_U1_A4(dest, length,
{ /* UOP */
s = ECTOR_MUL4_SYM(*src, color);
- sia = Alpha(~s);
+ sia = _alpha(~s);
*dest = s + BYTE_MUL(*dest, sia);
dest++; src++; length--;
},