Imported nxagent-3.4.0-3.tar.gznxagent/3.4.0-3

Summary: Imported nxagent-3.4.0-3.tar.gz
Keywords:

Imported nxagent-3.4.0-3.tar.gz
into Git repository

1 files changed, 2 insertions, 52 deletions

diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c b/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c
index d9054b4b6..5cd3e5073 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c
@@ -1,6 +1,6 @@
 /**************************************************************************/
 /*                                                                        */
-/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/.         */
+/* Copyright (c) 2001, 2009 NoMachine, http://www.nomachine.com/.         */
 /*                                                                        */
 /* NXAGENT, NX protocol compression and NX extensions to this software    */
 /* are copyright of NoMachine. Redistribution and use of the present      */
@@ -62,7 +62,6 @@
 #include "Screen.h"
 #include "Pixmaps.h"
 #include "Drawable.h"
-#include "Render.h"
 
 #define PANIC
 #define WARNING
@@ -873,9 +872,6 @@ AllocatePicture (ScreenPtr  pScreen)
 	else
 	    ppriv->ptr = (pointer)NULL;
     }
-
-    nxagentPicturePriv(pPicture) -> picture = 0;
-
     return pPicture;
 }
 
@@ -1067,49 +1063,7 @@ static void initGradient(SourcePictPtr pGradient, int stopCount,
 static PicturePtr createSourcePicture(void)
 {
     PicturePtr pPicture;
-
-    extern int nxagentPicturePrivateIndex;
-
-    unsigned int totalPictureSize;
-
-    DevUnion *ppriv;
-
-    char *privPictureRecAddr;
-
-    int i;
-
-    /*
-     * Compute size of entire PictureRect, plus privates.
-     */
-
-    totalPictureSize = sizeof(PictureRec) +
-                           picturePrivateCount * sizeof(DevUnion) +
-                               sizeof(nxagentPrivPictureRec);
-
-    pPicture = (PicturePtr) xalloc(totalPictureSize);
-
-    if (pPicture != NULL)
-    {
-      ppriv = (DevUnion *) (pPicture + 1);
-
-      for (i = 0; i < picturePrivateCount; ++i)
-      {
-        /*
-         * Other privates are inaccessible.
-         */
-
-        ppriv[i].ptr = NULL;
-      }
-
-      privPictureRecAddr = (char *) &ppriv[picturePrivateCount];
-
-      ppriv[nxagentPicturePrivateIndex].ptr = (pointer) privPictureRecAddr;
-
-      pPicture -> devPrivates = ppriv;
-
-      nxagentPicturePriv(pPicture) -> picture = 0;
-    }
-
+    pPicture = (PicturePtr) xalloc(sizeof(PictureRec));
     pPicture->pDrawable = 0;
     pPicture->pFormat = 0;
     pPicture->pNext = 0;
@@ -1743,10 +1697,6 @@ FreePicture (pointer	value,
 
     if (--pPicture->refcnt == 0)
     {
-#ifdef NXAGENT_SERVER
-        nxagentDestroyPicture(pPicture);
-#endif
-
 	if (pPicture->transform)
 	    xfree (pPicture->transform);
         if (!pPicture->pDrawable) {