[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/12] console: Clean up bytes per pixel calculation
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 08/12] console: Clean up bytes per pixel calculation |
Date: |
Fri, 14 Sep 2012 09:42:22 +0100 |
From: BALATON Zoltan <address@hidden>
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 <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
console.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/console.c b/console.c
index c1ed5e0..a8bcc42 100644
--- a/console.c
+++ b/console.c
@@ -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;
--
1.7.10.4
- [Qemu-devel] [PULL 00/12] Trivial patches for 16 August to 14 September 2012, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 01/12] srp: Don't use QEMU_PACKED for single elements of a structured type, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 05/12] ui: Fix spelling in comment (ressource -> resource), Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 02/12] Spelling fixes in comments and documentation, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 04/12] Spelling fixes in comments and macro names (ressource -> resource), Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 03/12] Fix spelling (licenced -> licensed) in GPL, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 06/12] linux-user: Remove #if 0'd cpu_get_real_ticks() definition, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 07/12] Fix copy&paste typos in documentation comments, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 08/12] console: Clean up bytes per pixel calculation,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 10/12] kvm: Fix warning from static code analysis, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 12/12] configure: fix seccomp check, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 09/12] qapi: Fix enumeration typo error, Stefan Hajnoczi, 2012/09/14
- [Qemu-devel] [PATCH 11/12] arch_init.c: add missing '%' symbols before PRIu64 in debug printfs, Stefan Hajnoczi, 2012/09/14
- Re: [Qemu-devel] [PULL 00/12] Trivial patches for 16 August to 14 September 2012, Anthony Liguori, 2012/09/17