forked from enlightenment/efl
Fix warnings. First compute value, then increment pointer.
SVN revision: 27585
This commit is contained in:
parent
6849defebf
commit
f979c8e54d
|
@ -6,7 +6,10 @@ static void
|
||||||
_op_blend_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
|
_op_blend_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
|
||||||
DATA32 *e = d + l, a = 256 - (c >> 24);
|
DATA32 *e = d + l, a = 256 - (c >> 24);
|
||||||
while (d < e)
|
while (d < e)
|
||||||
*d++ = c + MUL_256(a, *d);
|
{
|
||||||
|
*d = c + MUL_256(a, *d);
|
||||||
|
d++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#define _op_blend_caa_dp _op_blend_c_dp
|
#define _op_blend_caa_dp _op_blend_c_dp
|
||||||
|
@ -61,7 +64,10 @@ _op_blend_rel_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
|
||||||
DATA32 *e = d + l;
|
DATA32 *e = d + l;
|
||||||
l = 256 - (c >> 24);
|
l = 256 - (c >> 24);
|
||||||
while (d < e)
|
while (d < e)
|
||||||
*d++ = MUL_SYM(*d >> 24, c) + MUL_256(l, *d);
|
{
|
||||||
|
*d = MUL_SYM(*d >> 24, c) + MUL_256(l, *d);
|
||||||
|
d++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#define _op_blend_rel_caa_dp _op_blend_rel_c_dp
|
#define _op_blend_rel_caa_dp _op_blend_rel_c_dp
|
||||||
|
|
|
@ -118,7 +118,8 @@ _op_blend_rel_mas_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
|
||||||
while (d < e) {
|
while (d < e) {
|
||||||
DATA32 mc = MUL_SYM(*m, c);
|
DATA32 mc = MUL_SYM(*m, c);
|
||||||
l = 256 - (mc >> 24);
|
l = 256 - (mc >> 24);
|
||||||
*d++ = MUL_SYM(*d >> 24, mc) + MUL_256(l, *d);
|
*d = MUL_SYM(*d >> 24, mc) + MUL_256(l, *d);
|
||||||
|
d++;
|
||||||
m++;
|
m++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,8 @@ _op_blend_p_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
|
||||||
DATA32 *e = d + l;
|
DATA32 *e = d + l;
|
||||||
while (d < e) {
|
while (d < e) {
|
||||||
l = 256 - (*s >> 24);
|
l = 256 - (*s >> 24);
|
||||||
*d++ = *s++ + MUL_256(l, *d);
|
*d = *s++ + MUL_256(l, *d);
|
||||||
|
d++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -89,7 +90,8 @@ _op_blend_rel_p_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
|
||||||
while (d < e) {
|
while (d < e) {
|
||||||
l = 256 - (*s >> 24);
|
l = 256 - (*s >> 24);
|
||||||
c = 1 + (*d >> 24);
|
c = 1 + (*d >> 24);
|
||||||
*d++ = MUL_256(c, *s) + MUL_256(l, *d);
|
*d = MUL_256(c, *s) + MUL_256(l, *d);
|
||||||
|
d++;
|
||||||
s++;
|
s++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,8 @@ _op_blend_p_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
|
||||||
while (d < e) {
|
while (d < e) {
|
||||||
DATA32 sc = MUL4_SYM(c, *s);
|
DATA32 sc = MUL4_SYM(c, *s);
|
||||||
l = 256 - (sc >> 24);
|
l = 256 - (sc >> 24);
|
||||||
*d++ = sc + MUL_256(l, *d);
|
*d = sc + MUL_256(l, *d);
|
||||||
|
d++;
|
||||||
s++;
|
s++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -18,7 +19,8 @@ _op_blend_pan_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
|
||||||
DATA32 *e = d + l;
|
DATA32 *e = d + l;
|
||||||
l = 256 - (c >> 24);
|
l = 256 - (c >> 24);
|
||||||
while (d < e) {
|
while (d < e) {
|
||||||
*d++ = ((c & 0xff000000) + MUL3_SYM(c, *s)) + MUL_256(l, *d);
|
*d = ((c & 0xff000000) + MUL3_SYM(c, *s)) + MUL_256(l, *d);
|
||||||
|
d++;
|
||||||
s++;
|
s++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,7 +30,8 @@ _op_blend_p_can_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
|
||||||
DATA32 *e = d + l;
|
DATA32 *e = d + l;
|
||||||
while (d < e) {
|
while (d < e) {
|
||||||
l = 256 - (*s >> 24);
|
l = 256 - (*s >> 24);
|
||||||
*d++ = ((*s & 0xff000000) + MUL3_SYM(c, *s)) + MUL_256(l, *d);
|
*d = ((*s & 0xff000000) + MUL3_SYM(c, *s)) + MUL_256(l, *d);
|
||||||
|
d++;
|
||||||
s++;
|
s++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -49,7 +52,8 @@ _op_blend_p_caa_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
|
||||||
while (d < e) {
|
while (d < e) {
|
||||||
DATA32 sc = MUL_256(c, *s);
|
DATA32 sc = MUL_256(c, *s);
|
||||||
l = 256 - (sc >> 24);
|
l = 256 - (sc >> 24);
|
||||||
*d++ = sc + MUL_256(l, *d);
|
*d = sc + MUL_256(l, *d);
|
||||||
|
d++;
|
||||||
s++;
|
s++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -59,7 +63,8 @@ _op_blend_pan_caa_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
|
||||||
DATA32 *e = d + l;
|
DATA32 *e = d + l;
|
||||||
c = 1 + (c & 0xff);
|
c = 1 + (c & 0xff);
|
||||||
while (d < e) {
|
while (d < e) {
|
||||||
*d++ = INTERP_256(c, *s, *d);
|
*d = INTERP_256(c, *s, *d);
|
||||||
|
d++;
|
||||||
s++;
|
s++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -166,7 +171,8 @@ _op_blend_rel_p_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
|
||||||
while (d < e) {
|
while (d < e) {
|
||||||
DATA32 sc = MUL4_SYM(c, *s);
|
DATA32 sc = MUL4_SYM(c, *s);
|
||||||
l = 256 - (sc >> 24);
|
l = 256 - (sc >> 24);
|
||||||
*d++ = MUL_SYM(*d >> 24, sc) + MUL_256(l, *d);
|
*d = MUL_SYM(*d >> 24, sc) + MUL_256(l, *d);
|
||||||
|
d++;
|
||||||
s++;
|
s++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -129,8 +129,10 @@ _op_blend_rel_p_mas_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
|
||||||
while (d < e) {
|
while (d < e) {
|
||||||
c = MUL_SYM(*m, *s);
|
c = MUL_SYM(*m, *s);
|
||||||
l = 256 - (c >> 24);
|
l = 256 - (c >> 24);
|
||||||
*d++ = MUL_SYM(*d >> 24, c) + MUL_256(l, *d);
|
*d = MUL_SYM(*d >> 24, c) + MUL_256(l, *d);
|
||||||
m++; s++;
|
d++;
|
||||||
|
m++;
|
||||||
|
s++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,8 @@ static void
|
||||||
_op_copy_p_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
|
_op_copy_p_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
|
||||||
DATA32 *e = d + l;
|
DATA32 *e = d + l;
|
||||||
while (d < e) {
|
while (d < e) {
|
||||||
*d++ = MUL4_SYM(c, *s);
|
*d = MUL4_SYM(c, *s);
|
||||||
|
d++;
|
||||||
s++;
|
s++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -16,7 +17,8 @@ _op_copy_p_caa_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
|
||||||
DATA32 *e = d + l;
|
DATA32 *e = d + l;
|
||||||
c = 1 + (c >> 24);
|
c = 1 + (c >> 24);
|
||||||
while (d < e) {
|
while (d < e) {
|
||||||
*d++ = MUL_256(c, *s);
|
*d = MUL_256(c, *s);
|
||||||
|
d++;
|
||||||
s++;
|
s++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -130,7 +132,8 @@ _op_copy_rel_p_c_dp(DATA32 *s, DATA8 *m, DATA32 c, DATA32 *d, int l) {
|
||||||
DATA32 *e = d + l;
|
DATA32 *e = d + l;
|
||||||
while (d < e) {
|
while (d < e) {
|
||||||
DATA32 cs = MUL4_SYM(c, *s);
|
DATA32 cs = MUL4_SYM(c, *s);
|
||||||
*d++ = MUL_SYM(*d >> 24, cs);
|
*d = MUL_SYM(*d >> 24, cs);
|
||||||
|
d++;
|
||||||
s++;
|
s++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue