diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-08 09:06:44 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-08 09:06:44 +0200 |
| commit | 9b15e1cfe4c6ca9862c2865c4adbc21a758e9734 (patch) | |
| tree | 13452621f70604f08fd91b1bd46ed6341dbc2ea7 /pixman/test/glyph-test.c | |
| parent | bd13c464f728719fceb8a4918b52727ec125ea6e (diff) | |
| parent | de8397bc3d010bba24ec0c4d2e6249a769a86fc7 (diff) | |
| download | vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.tar.gz vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.tar.bz2 vcxsrv-9b15e1cfe4c6ca9862c2865c4adbc21a758e9734.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman libxcb mesa xserver xkeyboard-config git update 8 oct 2012
Conflicts:
xorg-server/Xext/xf86bigfont.c
xorg-server/dix/dispatch.c
xorg-server/include/dixstruct.h
xorg-server/os/connection.c
Diffstat (limited to 'pixman/test/glyph-test.c')
| -rw-r--r-- | pixman/test/glyph-test.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pixman/test/glyph-test.c b/pixman/test/glyph-test.c index 84de5aace..9dd5b41e4 100644 --- a/pixman/test/glyph-test.c +++ b/pixman/test/glyph-test.c @@ -30,10 +30,13 @@ static const pixman_format_code_t formats[] = PIXMAN_x14r6g6b6, PIXMAN_r8g8b8, PIXMAN_b8g8r8, +#if 0 + /* These use floating point */ PIXMAN_x2r10g10b10, PIXMAN_a2r10g10b10, PIXMAN_x2b10g10r10, PIXMAN_a2b10g10r10, +#endif PIXMAN_a1r5g5b5, PIXMAN_x1r5g5b5, PIXMAN_a1b5g5r5, @@ -329,7 +332,7 @@ test_glyphs (int testnum, int verbose) int main (int argc, const char *argv[]) { - return fuzzer_test_main ("glyph", 30000, - 0x741CB2DB, + return fuzzer_test_main ("glyph", 30000, + 0x79E74996, test_glyphs, argc, argv); } |