*** PixEdit.c.orig	Mon Aug 19 14:47:04 1996
--- PixEdit.c	Mon Aug 19 14:38:38 1996
***************
*** 1,5 ****
  /*
!  * $Id: PixEdit.c,v 1.15 1994/05/16 08:38:42 mallet Exp $
   * 
   * Copyright (c) 1991-1994  Lionel MALLET
   *
--- 1,5 ----
  /*
!  * $Id: PixEdit.c,v 1.16 1996/08/19 12:38:21 lmallet Exp $
   * 
   * Copyright (c) 1991-1994  Lionel MALLET
   *
***************
*** 55,61 ****
   * Author:  Davor Matic, MIT X Consortium
   */
  
! static char rcsid[] = "$Id: PixEdit.c,v 1.15 1994/05/16 08:38:42 mallet Exp $";
  
  
  #include <stdio.h>
--- 55,61 ----
   * Author:  Davor Matic, MIT X Consortium
   */
  
! static char rcsid[] = "$Id: PixEdit.c,v 1.16 1996/08/19 12:38:21 lmallet Exp $";
  
  
  #include <stdio.h>
***************
*** 1979,1985 ****
      /* some intializations */
      dpy = XtDisplay(top_widget);
      screen = DefaultScreen(dpy);
!     ncolors = DisplayCells(dpy, screen);
  #ifdef DEBUG
      printf("Num colors %d\n",ncolors);
      printf("Transparent entry in colormap %d\n", TRANSPARENT(dpy, screen));
--- 1979,1985 ----
      /* some intializations */
      dpy = XtDisplay(top_widget);
      screen = DefaultScreen(dpy);
!     ncolors = 1<<DisplayPlanes(dpy, screen);
  #ifdef DEBUG
      printf("Num colors %d\n",ncolors);
      printf("Transparent entry in colormap %d\n", TRANSPARENT(dpy, screen));
*** Pixmap.c.orig	Mon Aug 19 14:43:28 1996
--- Pixmap.c	Fri Aug 16 15:50:20 1996
***************
*** 1,5 ****
  /*
!  * $Id: Pixmap.c,v 1.18 1996/01/18 13:36:07 lmallet Exp $
   * 
   * Copyright (c) 1991-1994  Lionel MALLET
   *
--- 1,5 ----
  /*
!  * $Id: Pixmap.c,v 1.19 1996/08/16 13:50:17 lmallet Exp $
   * 
   * Copyright (c) 1991-1994  Lionel MALLET
   *
***************
*** 55,61 ****
   * Author:  Davor Matic, MIT X Consortium
   */
  
! static char rcsid[] = "$Id: Pixmap.c,v 1.18 1996/01/18 13:36:07 lmallet Exp $";
  
  #include <X11/IntrinsicP.h>
  #include <X11/Xmu/Converters.h>
--- 55,61 ----
   * Author:  Davor Matic, MIT X Consortium
   */
  
! static char rcsid[] = "$Id: Pixmap.c,v 1.19 1996/08/16 13:50:17 lmallet Exp $";
  
  #include <X11/IntrinsicP.h>
  #include <X11/Xmu/Converters.h>
***************
*** 1673,1682 ****
--- 1673,1688 ----
        infos->valuemask = XpmComments;
        if (PW->pixmap.hints_cmt)
          infos->hints_cmt = XtNewString(PW->pixmap.hints_cmt);
+       else
+ 	infos->hints_cmt = NULL;
        if (PW->pixmap.colors_cmt)
          infos->colors_cmt = XtNewString(PW->pixmap.colors_cmt);
+       else
+ 	infos->colors_cmt = NULL;
        if (PW->pixmap.pixels_cmt)
          infos->pixels_cmt = XtNewString(PW->pixmap.pixels_cmt);
+       else
+ 	infos->pixels_cmt = NULL;
      }
    else infos->valuemask = 0;
  
*** Pixmap.h.orig	Mon Aug 19 14:45:14 1996
--- Pixmap.h	Mon Aug 19 14:39:18 1996
***************
*** 1,5 ****
  /*
!  * $Id: Pixmap.h,v 1.12 1994/05/13 14:13:45 mallet Exp $
   * 
   * Copyright (c) 1991-1994  Lionel MALLET
   *
--- 1,5 ----
  /*
!  * $Id: Pixmap.h,v 1.13 1996/08/19 12:39:13 lmallet Exp $
   * 
   * Copyright (c) 1991-1994  Lionel MALLET
   *
***************
*** 196,202 ****
  
  #define NoColorName "None"
  #define UNDEF_PIXEL 0x80
! #define TRANSPARENT(dpy, scr_num) DisplayCells(dpy, scr_num)
  
  typedef struct _PWRequestRec PWRequestRec;
  typedef char *PWRequest;
--- 196,202 ----
  
  #define NoColorName "None"
  #define UNDEF_PIXEL 0x80
! #define TRANSPARENT(dpy, scr_num) (1<<DisplayPlanes(dpy, scr_num))
  
  typedef struct _PWRequestRec PWRequestRec;
  typedef char *PWRequest;