Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.464
diff -u -2 -0 -r1.464 ChangeLog
--- xc/ChangeLog	15 Oct 2004 21:43:31 -0000	1.464
+++ xc/ChangeLog	15 Oct 2004 22:05:22 -0000
@@ -1,21 +1,26 @@
 2004-10-15 Roland Mainz <roland.mainz@nrubsig.org>
+        * xc/programs/Xserver/Xprint/ps/PsColor.c
+        Bugzilla #1646: Fix the problem that |PsCreateColormap()| returns
+        a random value (patch by Stefan Dirsch/SuSE).
+
+2004-10-15 Roland Mainz <roland.mainz@nrubsig.org>
         * xc/programs/Xserver/Xprint/Oid.c
         Bugzilla #1637: Fix problems in oid code which may cause the
         usage of an invalid string pointer (original patch by Egbert Eich).
 
 Thu Oct 14 20:43:03 2004  Søren Sandmann  <sandmann@redhat.com>
 
 	* programs/xmodmap/pf.c (process_line): Fix a
 	write-to-constant-string issue.
 	* programs/xmodmap/xmodmap.c (main): Fix several buffer overruns.
 
 2004-10-14  Adam Jackson  <ajax@freedesktop.org>
 
 	* programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.S:
 	Bug #1628: Convert xf86{BusToMem,MemToBus} to PIC code, eliminating
 	a text relocation and enabling the server to be built as a
 	position-independent executable.  (PaX Team)
 
 2004-10-14 Roland Mainz <roland.mainz@nrubsig.org>
         * xc/programs/Xserver/Xprint/pcl/PclInit.c
         * xc/programs/Xserver/Xprint/ps/PsInit.c
Index: xc/programs/Xserver/Xprint/ps/PsColor.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/ps/PsColor.c,v
retrieving revision 1.4
diff -u -2 -0 -r1.4 PsColor.c
--- xc/programs/Xserver/Xprint/ps/PsColor.c	4 Oct 2004 05:04:14 -0000	1.4
+++ xc/programs/Xserver/Xprint/ps/PsColor.c	15 Oct 2004 22:05:30 -0000
@@ -67,41 +67,41 @@
 **    *  Contents:	Color routines for the PS driver
 **    *
 **    *  Created By:	Roger Helmendach (Liberty Systems)
 **    *
 **    *  Copyright:	Copyright 1996 The Open Group, Inc.
 **    *
 **    *********************************************************
 ** 
 ********************************************************************/
 
 #include "Ps.h"
 #include "mi.h"
 #include "micmap.h"
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "colormapst.h"
 
 Bool
 PsCreateColormap(ColormapPtr pColor)
 {
-  miInitializeColormap(pColor);
+  return miInitializeColormap(pColor);
 }
 
 void
 PsDestroyColormap(ColormapPtr pColor)
 {
   /* NO-OP */
 }
 
 void
 PsInstallColormap(ColormapPtr pColor)
 {
   miInstallColormap(pColor);
 }
 
 void
 PsUninstallColormap(ColormapPtr pColor)
 {
   miUninstallColormap(pColor);
 }