[openchrome-devel] xf86-video-openchrome: 3 commits - configure.ac src/via_xvmc.c

[Kevin Brace]

 configure.ac   |    2 +-
 src/via_xvmc.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cdbc47bb41195d0a2517f7a97549539765e27a6c
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Dec 20 15:45:55 2019 -0600

    Version bumped to 0.6.196
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/configure.ac b/configure.ac
index 96cec72..52cf664 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-video-openchrome],
-        [0.6.195],
+        [0.6.196],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit fade9c7c79e2b22ceab205f9e2d314c4c6efd104
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Dec 20 15:43:37 2019 -0600

    Second try at suppressing void pointer arithmetic compilation warnings
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_xv_overlay.c b/src/via_xv_overlay.c
index ccf7dd5..776a79e 100644
--- a/src/via_xv_overlay.c
+++ b/src/via_xv_overlay.c
@@ -1210,7 +1210,8 @@ CreateSurface(ScrnInfoPtr pScrn, CARD32 FourCC, CARD16 Width,
         pVia->swov.SWDevice.dwSWPhysicalAddr[0] = addr;
         pVia->swov.SWDevice.dwSWPhysicalAddr[1] = addr + fbsize;
         pVia->swov.SWDevice.lpSWOverlaySurface[0] = buf;
-        pVia->swov.SWDevice.lpSWOverlaySurface[1] = buf + fbsize;
+        pVia->swov.SWDevice.lpSWOverlaySurface[1] =
+                                        (unsigned char*)buf + fbsize;
 
         if (isplanar) {
             pVia->swov.SWDevice.dwSWCrPhysicalAddr[0] =
diff --git a/src/via_xvmc.c b/src/via_xvmc.c
index c3c8a8e..a69c944 100644
--- a/src/via_xvmc.c
+++ b/src/via_xvmc.c
@@ -604,8 +604,8 @@ ViaXvMCCreateSurface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf,
     yBufSize = stride(ctx->width) * ctx->height;
     for (i = 0; i < numBuffers; ++i) {
         memset(buf, 0, yBufSize);
-        memset(buf + yBufSize, 0x80, yBufSize >> 1);
-        buf += bufSize;
+        memset((unsigned char*)buf + yBufSize, 0x80, yBufSize >> 1);
+        buf = (unsigned char*)buf + bufSize;
     }
     drm_bo_unmap(pScrn, sPriv->memory_ref);
 
commit 636dbbec28b3e725d5da60b1d9c9cf3ccab4898d
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Dec 20 15:22:34 2019 -0600

    Revert commit 59c9d25e2b38ac0d9fc8a8756af5834c01fd1dec
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_xv_overlay.c b/src/via_xv_overlay.c
index 776a79e..ccf7dd5 100644
--- a/src/via_xv_overlay.c
+++ b/src/via_xv_overlay.c
@@ -1210,8 +1210,7 @@ CreateSurface(ScrnInfoPtr pScrn, CARD32 FourCC, CARD16 Width,
         pVia->swov.SWDevice.dwSWPhysicalAddr[0] = addr;
         pVia->swov.SWDevice.dwSWPhysicalAddr[1] = addr + fbsize;
         pVia->swov.SWDevice.lpSWOverlaySurface[0] = buf;
-        pVia->swov.SWDevice.lpSWOverlaySurface[1] =
-                                        (unsigned char*)buf + fbsize;
+        pVia->swov.SWDevice.lpSWOverlaySurface[1] = buf + fbsize;
 
         if (isplanar) {
             pVia->swov.SWDevice.dwSWCrPhysicalAddr[0] =
diff --git a/src/via_xvmc.c b/src/via_xvmc.c
index f376fd4..c3c8a8e 100644
--- a/src/via_xvmc.c
+++ b/src/via_xvmc.c
@@ -604,8 +604,8 @@ ViaXvMCCreateSurface(ScrnInfoPtr pScrn, XvMCSurfacePtr pSurf,
     yBufSize = stride(ctx->width) * ctx->height;
     for (i = 0; i < numBuffers; ++i) {
         memset(buf, 0, yBufSize);
-        memset((unsigned *)buf + yBufSize, 0x80, yBufSize >> 1);
-        (unsigned *)buf += bufSize;
+        memset(buf + yBufSize, 0x80, yBufSize >> 1);
+        buf += bufSize;
     }
     drm_bo_unmap(pScrn, sPriv->memory_ref);