NXpicturestr_PictSolidFill.h: Drop file and revert db8705. Not an issue anymore nowadays.

nx-X11/programs/Xserver/hw/nxagent/NXpicture.c

@@ -296,10 +296,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;
 }
 

nx-X11/programs/Xserver/hw/nxagent/NXpicturestr_PictSolidFill.h

-/**************************************************************************/
-/*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com)          */
-/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>  */
-/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
-/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de>                */
-/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de>                 */
-/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com)           */
-/*                                                                        */
-/* NXAGENT, NX protocol compression and NX extensions to this software    */
-/* are copyright of the aforementioned persons and companies.             */
-/*                                                                        */
-/* Redistribution and use of the present software is allowed according    */
-/* to terms specified in the file LICENSE which comes in the source       */
-/* distribution.                                                          */
-/*                                                                        */
-/* All rights reserved.                                                   */
-/*                                                                        */
-/* NOTE: This software has received contributions from various other      */
-/* contributors, only the core maintainers and supporters are listed as   */
-/* copyright holders. Please contact us, if you feel you should be listed */
-/* as copyright holder, as well.                                          */
-/*                                                                        */
-/**************************************************************************/
-
-/*
- * $Id: picturestr.h,v 1.15 2005/12/09 18:35:21 ajax Exp $
- *
- * Copyright © 2000 SuSE, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of SuSE not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  SuSE makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author:  Keith Packard, SuSE, Inc.
- */
-
-/* this header file gets included into Xserver/render/picturestr.h */
-
-#ifndef NX_PICTURESTR_PICTSOLIDFILL_H
-#define NX_PICTURESTR_PICTSOLIDFILL_H 1
-
-
-typedef struct _PictSolidFill {
-    unsigned int type;
-    CARD32 color;
-    xRenderColor fullColor;
-} PictSolidFill, *PictSolidFillPtr;
-
-#endif /* NX_PICTURESTR_PICTSOLIDFILL_H */

nx-X11/programs/Xserver/hw/nxagent/Render.c

@@ -2662,17 +2662,11 @@ void nxagentReconnectPicture(void * p0, XID x1, void *p2)
     #endif
   }
 
-  if (!pForm && pPicture->pSourcePict)
-  {
-        /*possible we need to add support for other picture types, for example gradients...*/
-        switch(pPicture->pSourcePict->type)
-        {
-        case SourcePictTypeSolidFill:
-            nxagentPicturePriv(pPicture) -> picture = XRenderCreateSolidFill(nxagentDisplay,
-                    (const XRenderColor*) &pPicture->pSourcePict->solidFill.fullColor);
-            break;
-        }
-        return;
+  if (!pForm)
+  {
+    *pBool = False;
+
+    return;
   }
 
   #ifdef TEST

nx-X11/programs/Xserver/render/picturestr.h

@@ -65,14 +65,10 @@ typedef struct pixman_transform PictTransform, *PictTransformPtr;
 #define SourcePictTypeRadial 2
 #define SourcePictTypeConical 3
 
-#ifdef NXAGENT_SERVER
-#include "../hw/nxagent/NXpicturestr_PictSolidFill.h"
-#else
 typedef struct _PictSolidFill {
     unsigned int type;
     CARD32 color;
 } PictSolidFill, *PictSolidFillPtr;
-#endif /* NXAGENT_SERVER */
 
 typedef struct _PictGradientStop {
     xFixed x;