diff options
| author | BALATON Zoltan <balaton@eik.bme.hu> | 2012-08-22 17:19:42 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@gmail.com> | 2012-09-14 08:21:29 +0100 |
| commit | feadf1a4de0d7468ffb671a2b9f681925469fa58 (patch) | |
| tree | e8539153e7bc264b664339c9df826fc973a9ee15 /console.c | |
| parent | 1a7e8cae4bfd99beca9103de188440afda6c002a (diff) | |
| download | qemu-feadf1a4de0d7468ffb671a2b9f681925469fa58.zip qemu-feadf1a4de0d7468ffb671a2b9f681925469fa58.tar.gz qemu-feadf1a4de0d7468ffb671a2b9f681925469fa58.tar.bz2 | |
console: Clean up bytes per pixel calculation
Division with round up is the correct way to compute this even if the
only case where division with round down gives incorrect result is
probably 15 bpp. This case was explicitely patched up in one of these
functions but was unhandled in the other. (I'm not sure about setting
16 bpp for the 15bpp case either but I left that there for now.)
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Diffstat (limited to 'console.c')
| -rw-r--r-- | console.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1612,7 +1612,7 @@ PixelFormat qemu_different_endianness_pixelformat(int bpp) memset(&pf, 0x00, sizeof(PixelFormat)); pf.bits_per_pixel = bpp; - pf.bytes_per_pixel = bpp / 8; + pf.bytes_per_pixel = DIV_ROUND_UP(bpp, 8); pf.depth = bpp == 32 ? 24 : bpp; switch (bpp) { @@ -1661,13 +1661,12 @@ PixelFormat qemu_default_pixelformat(int bpp) memset(&pf, 0x00, sizeof(PixelFormat)); pf.bits_per_pixel = bpp; - pf.bytes_per_pixel = bpp / 8; + pf.bytes_per_pixel = DIV_ROUND_UP(bpp, 8); pf.depth = bpp == 32 ? 24 : bpp; switch (bpp) { case 15: pf.bits_per_pixel = 16; - pf.bytes_per_pixel = 2; pf.rmask = 0x00007c00; pf.gmask = 0x000003E0; pf.bmask = 0x0000001F; |