[gs-cvs] rev 7087 - trunk/gs/src

[stefan at ghostscript.com]

Author: stefan
Date: 2006-10-06 07:08:05 -0700 (Fri, 06 Oct 2006)
New Revision: 7087

Modified:
   trunk/gs/src/gxdcolor.c
Log:
Restore code that is required for raster ops. 




Modified: trunk/gs/src/gxdcolor.c
===================================================================
--- trunk/gs/src/gxdcolor.c	2006-10-05 01:45:56 UTC (rev 7086)
+++ trunk/gs/src/gxdcolor.c	2006-10-06 14:08:05 UTC (rev 7087)
@@ -417,13 +417,18 @@
 	gx_color_index scolors[2];
 	gx_color_index tcolors[2];
 
-	scolors[0] = gx_device_black(dev);
-	scolors[1] = gx_device_white(dev);
+	if ( lop != lop_default ) {
+	    scolors[0] = gx_device_white(dev);
+	    scolors[1] = gx_device_black(dev);
+	} else {
+	    scolors[0] = gx_device_black(dev);
+	    scolors[1] = gx_device_white(dev);
+        }
 	tcolors[0] = tcolors[1] = pdevc->colors.pure;
 	return (*dev_proc(dev, strip_copy_rop))
 	    (dev, data, data_x, raster, id, scolors,
 	     NULL, tcolors, x, y, w, h, 0, 0,
-	     (invert ? rop3_invert_S(lop) : lop) | lop_S_transparent);
+	     (invert ? rop3_invert_S(lop) : lop) | (rop3_S | lop_S_transparent));
     }
 }