From baca0ce6b3e78424794016ac16afb99b4239c096 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Thu, 28 Mar 2019 12:28:29 +0000
Subject: [PATCH] Fix VGLGetXY(), VGLSetXY() and VGLClear() for MEMBUFs in
 depths > 8.

This depends on PixelBytes being properly initialized, which it is for
all bitmaps constructed by libvgl except mouse cursor bitmaps.
---
 lib/libvgl/simple.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/lib/libvgl/simple.c b/lib/libvgl/simple.c
index a21c917aeb84..d4bb69cb848a 100644
--- a/lib/libvgl/simple.c
+++ b/lib/libvgl/simple.c
@@ -102,6 +102,15 @@ VGLSetXY(VGLBitmap *object, int x, int y, u_long color)
         !VGLMouseFreeze(x, y, 1, 1, 0x80000000 | color)) {
       switch (object->Type) {
       case MEMBUF:
+      switch (object->PixelBytes) {
+      case 2:
+        goto vidbuf16;
+      case 3:
+        goto vidbuf24;
+      case 4:
+        goto vidbuf32;
+      }
+      /* fallthrough */
       case VIDBUF8:
         object->Bitmap[y*object->VXsize+x]=((byte)color);
         break;
@@ -109,8 +118,11 @@ VGLSetXY(VGLBitmap *object, int x, int y, u_long color)
 	object->Bitmap[VGLSetSegment(y*object->VXsize+x)]=((byte)color);
 	break;
       case VIDBUF16:
+vidbuf16:
       case VIDBUF24:
+vidbuf24:
       case VIDBUF32:
+vidbuf32:
 	color2mem(color, b, object->PixelBytes);
         bcopy(b, &object->Bitmap[(y*object->VXsize+x) * object->PixelBytes],
 		object->PixelBytes);
@@ -156,13 +168,25 @@ __VGLGetXY(VGLBitmap *object, int x, int y)
 
   switch (object->Type) {
     case MEMBUF:
+    switch (object->PixelBytes) {
+    case 2:
+      goto vidbuf16;
+    case 3:
+      goto vidbuf24;
+    case 4:
+      goto vidbuf32;
+    }
+    /* fallthrough */
     case VIDBUF8:
       return object->Bitmap[((y*object->VXsize)+x)];
     case VIDBUF8S:
       return object->Bitmap[VGLSetSegment(y*object->VXsize+x)];
     case VIDBUF16:
+vidbuf16:
     case VIDBUF24:
+vidbuf24:
     case VIDBUF32:
+vidbuf32:
       bcopy(&object->Bitmap[(y*object->VXsize+x) * object->PixelBytes],
 		b, object->PixelBytes);
       return (mem2color(b, object->PixelBytes));
@@ -525,6 +549,15 @@ VGLClear(VGLBitmap *object, u_long color)
     VGLMouseFreeze(0, 0, object->Xsize, object->Ysize, color);
   switch (object->Type) {
   case MEMBUF:
+  switch (object->PixelBytes) {
+  case 2:
+    goto vidbuf16;
+  case 3:
+    goto vidbuf24;
+  case 4:
+    goto vidbuf32;
+  }
+  /* fallthrough */
   case VIDBUF8:
     memset(object->Bitmap, (byte)color, object->VXsize*object->VYsize);
     break;
@@ -539,8 +572,11 @@ VGLClear(VGLBitmap *object, u_long color)
     }
     break;
   case VIDBUF16:
+vidbuf16:
   case VIDBUF24:
+vidbuf24:
   case VIDBUF32:
+vidbuf32:
     color2mem(color, b, object->PixelBytes);
     total = object->VXsize*object->VYsize*object->PixelBytes;
     for (i = 0; i < total; i += object->PixelBytes)