qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH v2] console: Correct computation of bytes per pixel from bits per pixel
@ 2012-08-22 15:19 BALATON Zoltan
  2012-08-22 15:32 ` Jan Kiszka
  2012-08-24 11:16 ` [Qemu-devel] " Stefan Hajnoczi
  0 siblings, 2 replies; 9+ messages in thread
From: BALATON Zoltan @ 2012-08-22 15:19 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial

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>
---
  console.c |    5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)

  v2: Use DIV_ROUND_UP and extended commit message

diff --git a/console.c b/console.c
index 4525cc7..9df1701 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

^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2012-08-24 11:53 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-22 15:19 [Qemu-devel] [PATCH v2] console: Correct computation of bytes per pixel from bits per pixel BALATON Zoltan
2012-08-22 15:32 ` Jan Kiszka
2012-08-22 16:29   ` Stefan Weil
2012-08-22 16:44     ` Jan Kiszka
2012-08-22 16:56       ` Jan Kiszka
2012-08-24 11:20       ` [Qemu-devel] [Qemu-trivial] " Stefan Hajnoczi
2012-08-24 11:21         ` Jan Kiszka
2012-08-24 11:53           ` Stefan Hajnoczi
2012-08-24 11:16 ` [Qemu-devel] " Stefan Hajnoczi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).