frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://herrb@git.freedesktop.org/git/xorg/xserver

This commit is contained in:
Matthieu Herrb 2007-09-04 22:40:31 +02:00
parent 4062db4020 735da3dcd0
commit bf59485187
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/i2c/xf86i2c.c
View File

@ -883,7 +883,7 @@ xf86I2CGetScreenBuses(int scrnIndex, I2CBusPtr **pppI2CBus)
continue;
*pppI2CBus = xnfrealloc(*pppI2CBus, n * sizeof(I2CBusPtr));
*pppI2CBus[n - 1] = pI2CBus;
(*pppI2CBus)[n - 1] = pI2CBus;
}
return n;

9
hw/xfree86/xaa/xaaGC.c
View File

@ -80,10 +80,11 @@ XAAValidateGC(
}
if(pGC->depth != 32) {
if(pGC->bgPixel == -1) /* -1 is reserved for transparency */
pGC->bgPixel = 0x7fffffff;
if(pGC->fgPixel == -1) /* -1 is reserved for transparency */
pGC->fgPixel = 0x7fffffff;
/* 0xffffffff is reserved for transparency */
if(pGC->bgPixel == 0xffffffff)
pGC->bgPixel = 0x7fffffff;
if(pGC->fgPixel == 0xffffffff)
pGC->fgPixel = 0x7fffffff;
}
if((pDraw->type == DRAWABLE_PIXMAP) && !IS_OFFSCREEN_PIXMAP(pDraw)){