diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-24 08:40:35 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-24 08:40:35 +0100 |
| commit | 3e3af07f7697e9d23dd62fcf8f3a055602ae3341 (patch) | |
| tree | 9ad4b80b0c4df6e2dae13cde8d248a72273f9aae /pixman/test/alphamap.c | |
| parent | 7002c66cfba01e7d3b88dae498a195f78f0e83f5 (diff) | |
| parent | 06872e284da1c00ce03b234ca24aefeac64990d2 (diff) | |
| download | vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.gz vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.tar.bz2 vcxsrv-3e3af07f7697e9d23dd62fcf8f3a055602ae3341.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013
Conflicts:
mesalib/src/glsl/.gitignore
Diffstat (limited to 'pixman/test/alphamap.c')
| -rw-r--r-- | pixman/test/alphamap.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/pixman/test/alphamap.c b/pixman/test/alphamap.c index 1a6fca55a..4d09076fb 100644 --- a/pixman/test/alphamap.c +++ b/pixman/test/alphamap.c @@ -26,25 +26,6 @@ static const int origins[] = 0, 10, -100 }; -static const char * -format_name (pixman_format_code_t format) -{ - if (format == PIXMAN_a8) - return "a8"; - else if (format == PIXMAN_a2r10g10b10) - return "a2r10g10b10"; - else if (format == PIXMAN_a8r8g8b8) - return "a8r8g8b8"; - else if (format == PIXMAN_a4r4g4b4) - return "a4r4g4b4"; - else if (format == PIXMAN_null) - return "none"; - else - assert (0); - - return "<unknown - bug in alphamap.c>"; -} - static void on_destroy (pixman_image_t *image, void *data) { |