summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2002-11-13 16:48:47 +0000
committerBrian Paul <[email protected]>2002-11-13 16:48:47 +0000
commit36723b6538f1b9b59981cb6402a2dd807debee27 (patch)
tree821e2fcecda97e0d474d4c999637f390489a3b75
parente21a79bfdd75b77385fb7e196c2898d96420d478 (diff)
check for NULL span argument
-rw-r--r--src/mesa/drivers/x11/xm_span.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/x11/xm_span.c b/src/mesa/drivers/x11/xm_span.c
index f891fa84032..c62b15835b0 100644
--- a/src/mesa/drivers/x11/xm_span.c
+++ b/src/mesa/drivers/x11/xm_span.c
@@ -1,8 +1,8 @@
-/* $Id: xm_span.c,v 1.17 2002/10/24 23:57:23 brianp Exp $ */
+/* $Id: xm_span.c,v 1.18 2002/11/13 16:48:47 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.5
+ * Version: 5.1
*
* Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
*
@@ -2563,7 +2563,7 @@ static void write_span_mono_pixmap( MONO_SPAN_ARGS )
/* Identify and emit contiguous rendered pixels
*/
- while (i < n && mask[i])
+ while (i < n && (!mask || mask[i]))
i++;
if (start < i)
@@ -2765,7 +2765,7 @@ static void write_span_mono_8R8G8B_ximage( MONO_SPAN_ARGS )
GLuint *ptr = PIXELADDR4( xmesa->xm_buffer, x, y );
GLuint i;
for (i=0;i<n;i++) {
- if (mask[i]) {
+ if (!mask || mask[i]) {
ptr[i] = pixel;
}
}