More 0 -> NULL for pointers missed in previous commit to this file.

This commit is contained in:
Eric Anholt 2005-08-30 03:42:07 +00:00
parent 7777d325a3
commit f20e845b04

View File

@ -1,5 +1,5 @@
/* /*
* $XdotOrg: xc/programs/Xserver/fb/fbcompose.c,v 1.19 2005/08/12 18:50:33 sandmann Exp $ * $XdotOrg: xc/programs/Xserver/fb/fbcompose.c,v 1.20 2005/08/30 03:01:38 anholt Exp $
* $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17tsi Exp $ * $XFree86: xc/programs/Xserver/fb/fbcompose.c,v 1.17tsi Exp $
* *
* Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
@ -2547,7 +2547,7 @@ fbCombineConjointXorC (CARD32 *dest, CARD32 *src, CARD32 *mask, int width)
static CombineFuncC fbCombineFuncC[] = { static CombineFuncC fbCombineFuncC[] = {
fbCombineClearC, fbCombineClearC,
fbCombineSrcC, fbCombineSrcC,
0, /* Dest */ NULL, /* Dest */
fbCombineOverC, fbCombineOverC,
fbCombineOverReverseC, fbCombineOverReverseC,
fbCombineInC, fbCombineInC,
@ -2559,11 +2559,11 @@ static CombineFuncC fbCombineFuncC[] = {
fbCombineXorC, fbCombineXorC,
fbCombineAddC, fbCombineAddC,
fbCombineSaturateC, fbCombineSaturateC,
0, NULL,
0, NULL,
fbCombineClearC, /* 0x10 */ fbCombineClearC, /* 0x10 */
fbCombineSrcC, fbCombineSrcC,
0, /* Dest */ NULL, /* Dest */
fbCombineDisjointOverC, fbCombineDisjointOverC,
fbCombineSaturateC, /* DisjointOverReverse */ fbCombineSaturateC, /* DisjointOverReverse */
fbCombineDisjointInC, fbCombineDisjointInC,
@ -2573,13 +2573,13 @@ static CombineFuncC fbCombineFuncC[] = {
fbCombineDisjointAtopC, fbCombineDisjointAtopC,
fbCombineDisjointAtopReverseC, fbCombineDisjointAtopReverseC,
fbCombineDisjointXorC, /* 0x1b */ fbCombineDisjointXorC, /* 0x1b */
0, NULL,
0, NULL,
0, NULL,
0, NULL,
fbCombineClearC, fbCombineClearC,
fbCombineSrcC, fbCombineSrcC,
0, /* Dest */ NULL, /* Dest */
fbCombineConjointOverC, fbCombineConjointOverC,
fbCombineConjointOverReverseC, fbCombineConjointOverReverseC,
fbCombineConjointInC, fbCombineConjointInC,