fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 08:48:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

more merging:

Browse source 
630. Fix incorrect datatype for the pixmap width in fbCompositeSrcAdd_8000x8000(), and add some small optimisations (#A.1423, Keith Packard).
This commit is contained in:
Jeff Muizelaar 2005-06-23 19:33:34 +00:00
parent 81ec183697
commit aa07c01cb5
2 changed files with 33 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pixman/ChangeLog
View file

@ -1,4 +1,14 @@
2005-06-23 Jeff Muizelaar <jrmuizel@infidigm.net>
2005-06-23 Jeff Muizelaar <jeff@infidigm.net>
* src/ic.c: (pixman_compositeSrcAdd_8000x8000),
(pixman_compositeSrcAdd_8888x8888):
more merging:
630. Fix incorrect datatype for the pixmap width in
fbCompositeSrcAdd_8000x8000(), and add some small optimisations
(#A.1423, Keith Packard).
2005-06-23 Jeff Muizelaar <jeff@infidigm.net>
* src/icint.h:
* src/icblt.c: (IcBlt):

36
pixman/src/ic.c
View file

@ -681,13 +681,17 @@ pixman_compositeSrcAdd_8000x8000 (pixman_operator_t op,
while (w--)
{
s = *src++;
if (s != 0xff)
if (s)
{
d = *dst;
t = d + s;
s = t | (0 - (t >> 8));
if (s != 0xff)
{
d = *dst;
t = d + s;
s = t | (0 - (t >> 8));
}
*dst = s;
}
*dst++ = s;
dst++;
}
}
}
@ -728,19 +732,23 @@ pixman_compositeSrcAdd_8888x8888 (pixman_operator_t op,
while (w--)
{
s = *src++;
if (s != 0xffffffff)
if (s)
{
d = *dst;
if (d)
if (s != 0xffffffff)
{
m = IcAdd(s,d,0,t);
n = IcAdd(s,d,8,t);
o = IcAdd(s,d,16,t);
p = IcAdd(s,d,24,t);
s = m|n|o|p;
d = *dst;
if (d)
{
m = IcAdd(s,d,0,t);
n = IcAdd(s,d,8,t);
o = IcAdd(s,d,16,t);
p = IcAdd(s,d,24,t);
s = m|n|o|p;
}
}
*dst = s;
}
*dst++ = s;
dst++;
}
}
}