From owner-svn-src-all@freebsd.org Thu Mar 28 12:28:30 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 96489155B5E7; Thu, 28 Mar 2019 12:28:30 +0000 (UTC) (envelope-from bde@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 395B86E360; Thu, 28 Mar 2019 12:28:30 +0000 (UTC) (envelope-from bde@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0DD231F1A0; Thu, 28 Mar 2019 12:28:30 +0000 (UTC) (envelope-from bde@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2SCSThB018571; Thu, 28 Mar 2019 12:28:29 GMT (envelope-from bde@FreeBSD.org) Received: (from bde@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2SCSTFt018570; Thu, 28 Mar 2019 12:28:29 GMT (envelope-from bde@FreeBSD.org) Message-Id: <201903281228.x2SCSTFt018570@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bde set sender to bde@FreeBSD.org using -f From: Bruce Evans Date: Thu, 28 Mar 2019 12:28:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345639 - head/lib/libvgl X-SVN-Group: head X-SVN-Commit-Author: bde X-SVN-Commit-Paths: head/lib/libvgl X-SVN-Commit-Revision: 345639 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 395B86E360 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.980,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Mar 2019 12:28:30 -0000 Author: bde Date: Thu Mar 28 12:28:29 2019 New Revision: 345639 URL: https://svnweb.freebsd.org/changeset/base/345639 Log: 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. Modified: head/lib/libvgl/simple.c Modified: head/lib/libvgl/simple.c ============================================================================== --- head/lib/libvgl/simple.c Thu Mar 28 10:56:27 2019 (r345638) +++ head/lib/libvgl/simple.c Thu Mar 28 12:28:29 2019 (r345639) @@ -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)