From f466fb2432292d74123d701764c432d3aa75ef1d Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 10 Apr 2014 11:45:37 -0400
Subject: xres: Fix size estimation for <8bpp pixmaps (#69057)

Just use floats, it's not like this is a performance path.

Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
---
 Xext/xres.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Xext')

diff --git a/Xext/xres.c b/Xext/xres.c
index b26cbb5c5..546b942a1 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -353,9 +353,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,  
-- 
cgit v1.2.3