diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-11 11:15:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-11 11:15:52 +0200 |
| commit | 1de316b38f589817344e1a342050de4c427501df (patch) | |
| tree | de3ec426a2a640a021b17ea55da8d71a07a8a412 /pixman/test | |
| parent | 41665774749bc54dcd635ebbaab045a4350d5b2f (diff) | |
| parent | a7d3f63ee5e292379ed6d6eba0c65512205a4786 (diff) | |
| download | vcxsrv-1de316b38f589817344e1a342050de4c427501df.tar.gz vcxsrv-1de316b38f589817344e1a342050de4c427501df.tar.bz2 vcxsrv-1de316b38f589817344e1a342050de4c427501df.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman git update 11 Sep 2013
Conflicts:
pixman/pixman/pixman-sse2.c
Diffstat (limited to 'pixman/test')
| -rw-r--r-- | pixman/test/affine-test.c | 4 | ||||
| -rw-r--r-- | pixman/test/scaling-test.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/pixman/test/affine-test.c b/pixman/test/affine-test.c index 2506250db..c1649ed5e 100644 --- a/pixman/test/affine-test.c +++ b/pixman/test/affine-test.c @@ -306,9 +306,7 @@ test_composite (int testnum, return crc32; } -#if BILINEAR_INTERPOLATION_BITS == 8 -#define CHECKSUM 0x2CDF1F07 -#elif BILINEAR_INTERPOLATION_BITS == 7 +#if BILINEAR_INTERPOLATION_BITS == 7 #define CHECKSUM 0xBC00B1DF #elif BILINEAR_INTERPOLATION_BITS == 4 #define CHECKSUM 0xA227306B diff --git a/pixman/test/scaling-test.c b/pixman/test/scaling-test.c index a8cb4c47b..b4142a796 100644 --- a/pixman/test/scaling-test.c +++ b/pixman/test/scaling-test.c @@ -375,9 +375,7 @@ test_composite (int testnum, return crc32; } -#if BILINEAR_INTERPOLATION_BITS == 8 -#define CHECKSUM 0x9096E6B6 -#elif BILINEAR_INTERPOLATION_BITS == 7 +#if BILINEAR_INTERPOLATION_BITS == 7 #define CHECKSUM 0xCE8EC6BA #elif BILINEAR_INTERPOLATION_BITS == 4 #define CHECKSUM 0xAB1D39BE |