pixman: Branch 'master'

[Pekka Paalanen]

 test/lowlevel-blt-bench.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit fd595692941f3d9ddea8934462bd1d18aed07c65
Author: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
Date:   Tue Jul 7 11:31:20 2015 +0300

    lowlevel-blt-bench: make extra arguments an error
    
    If a user gives multiple patterns or extra arguments, only the last one
    was used as the pattern while the former were just ignored. This is a
    user error silently converted to something possibly unexpected.
    
    In presence of extra arguments, complain and quit.
    
    Cc: Ben Avison <bavison at riscosopen.org>
    Signed-off-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

diff --git a/test/lowlevel-blt-bench.c b/test/lowlevel-blt-bench.c
index fc7472f..28ff669 100644
--- a/test/lowlevel-blt-bench.c
+++ b/test/lowlevel-blt-bench.c
@@ -1122,6 +1122,12 @@ main (int argc, char *argv[])
 	}
 	else
 	{
+	    if (pattern)
+	    {
+		pattern = NULL;
+		printf ("Error: extra arguments given.\n");
+		break;
+	    }
 	    pattern = argv[i];
 	}
     }