diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-23 22:47:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-23 22:47:55 +0200 |
| commit | 24fb0da18f1c44dfa1f76d8cde8efbb958aa7659 (patch) | |
| tree | 76157bb2f88c9383b0824476a9e3a9f9a1bff9fa /xorg-server/Xext | |
| parent | 6876c31f186414ce975180af79902314c8cdc82a (diff) | |
| parent | d26ea2f474c48afa7d3c261572da5d85b7b62bd8 (diff) | |
| download | vcxsrv-24fb0da18f1c44dfa1f76d8cde8efbb958aa7659.tar.gz vcxsrv-24fb0da18f1c44dfa1f76d8cde8efbb958aa7659.tar.bz2 vcxsrv-24fb0da18f1c44dfa1f76d8cde8efbb958aa7659.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/include/GL/glext.h
xorg-server/.gitignore
xorg-server/glx/glxext.c
Diffstat (limited to 'xorg-server/Xext')
| -rw-r--r-- | xorg-server/Xext/xres.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/Xext/xres.c b/xorg-server/Xext/xres.c index 32e8c8135..c63046f8f 100644 --- a/xorg-server/Xext/xres.c +++ b/xorg-server/Xext/xres.c @@ -350,9 +350,9 @@ static unsigned long ResGetApproxPixmapBytes(PixmapPtr pix) { unsigned long nPixels; - int bytesPerPixel; + float bytesPerPixel; - bytesPerPixel = pix->drawable.bitsPerPixel >> 3; + bytesPerPixel = (float)pix->drawable.bitsPerPixel / 8.0; nPixels = pix->drawable.width * pix->drawable.height; /* Divide by refcnt as pixmap could be shared between clients, |