From db7feaf9883bb0dc419593588036405ef12ebca1 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 28 Mar 2013 08:58:35 +0100
Subject: Revert "release 3.5.0.19"

This reverts commit e77bf36d9afbc7e56522574b06217d57c11dd095.
---
 nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c   |  4 ---
 .../programs/Xserver/hw/nxagent/X/NXpicturestr.h   |  1 -
 nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c    | 30 +++++++++-------------
 3 files changed, 12 insertions(+), 23 deletions(-)

(limited to 'nx-X11/programs/Xserver/hw/nxagent/X')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c b/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c
index 4b342ebcf..d9054b4b6 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c
@@ -1137,10 +1137,6 @@ CreateSolidPicture (Picture pid, xRenderColor *color, int *error)
     }
     pPicture->pSourcePict->type = SourcePictTypeSolidFill;
     pPicture->pSourcePict->solidFill.color = xRenderColorToCard32(*color);
-    pPicture->pSourcePict->solidFill.fullColor.alpha=color->alpha;
-    pPicture->pSourcePict->solidFill.fullColor.red=color->red;
-    pPicture->pSourcePict->solidFill.fullColor.green=color->green;
-    pPicture->pSourcePict->solidFill.fullColor.blue=color->blue;
     return pPicture;
 }
 
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h b/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h
index b2679257c..0d1a8e1d8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXpicturestr.h
@@ -95,7 +95,6 @@ typedef struct _PictTransform {
 typedef struct _PictSolidFill {
     unsigned int type;
     CARD32 color;
-    xRenderColor fullColor;
 } PictSolidFill, *PictSolidFillPtr;
 
 typedef struct _PictGradientStop {
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c b/nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c
index cbb3f63e8..f6dad312a 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c
@@ -275,19 +275,17 @@ ProcXvDispatch(ClientPtr client)
     case xv_PutVideo:
 #ifdef PANORAMIX
         if(!noPanoramiXExtension)
-            result = (XineramaXvPutVideo(client));
+            result = (XineramaXvPutVideo(client)); break;
         else
 #endif
-            result = (ProcXvPutVideo(client));
-            break;
+            result = (ProcXvPutVideo(client)); break;
     case xv_PutStill:
 #ifdef PANORAMIX
         if(!noPanoramiXExtension)
-            result = (XineramaXvPutStill(client));
+            result = (XineramaXvPutStill(client)); break
         else
 #endif
-    	    result = (ProcXvPutStill(client));
-    	    break;
+    	    result = (ProcXvPutStill(client)); break;
     case xv_GetVideo: result = (ProcXvGetVideo(client)); break;
     case xv_GetStill: result = (ProcXvGetStill(client)); break;
     case xv_GrabPort: result = (ProcXvGrabPort(client)); break;
@@ -297,39 +295,35 @@ ProcXvDispatch(ClientPtr client)
     case xv_StopVideo: 
 #ifdef PANORAMIX
         if(!noPanoramiXExtension)
-	    result = (XineramaXvStopVideo(client));
+	    result = (XineramaXvStopVideo(client)); break;
 	else
 #endif
-	    result = (ProcXvStopVideo(client));
-            break;
+	    result = (ProcXvStopVideo(client)); break;
     case xv_SetPortAttribute: 
 #ifdef PANORAMIX
         if(!noPanoramiXExtension)
-	    result = (XineramaXvSetPortAttribute(client));
+	    result = (XineramaXvSetPortAttribute(client)); break;
 	else
 #endif
-	    result = (ProcXvSetPortAttribute(client));
-            break;
+	    result = (ProcXvSetPortAttribute(client)); break;
     case xv_GetPortAttribute: result = (ProcXvGetPortAttribute(client)); break;
     case xv_QueryBestSize: result = (ProcXvQueryBestSize(client)); break;
     case xv_QueryPortAttributes: result = (ProcXvQueryPortAttributes(client)); break;
     case xv_PutImage:
 #ifdef PANORAMIX
         if(!noPanoramiXExtension)
-	    result = (XineramaXvPutImage(client));
+	    result = (XineramaXvPutImage(client)); break;
 	else
 #endif
-	    result = (ProcXvPutImage(client));
-            break;
+	    result = (ProcXvPutImage(client)); break;
 #ifdef MITSHM
     case xv_ShmPutImage: 
 #ifdef PANORAMIX
         if(!noPanoramiXExtension)
-	    result = (XineramaXvShmPutImage(client));
+	    result = (XineramaXvShmPutImage(client)); break;
 	else
 #endif
-	    result = (ProcXvShmPutImage(client));
-	    break;
+	    result = (ProcXvShmPutImage(client)); break;
 #endif
     case xv_QueryImageAttributes: result = (ProcXvQueryImageAttributes(client)); break;
     case xv_ListImageFormats: result = (ProcXvListImageFormats(client)); break;
-- 
cgit v1.2.3