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

[ray at ghostscript.com]

Author: ray
Date: 2007-12-11 15:47:18 -0800 (Tue, 11 Dec 2007)
New Revision: 8436

Modified:
   trunk/gs/src/gdevpsd.c
Log:
Fix for SEGV when more than 4 colorants used with psdcmyk device.
Bug 689457 for customer #460.

DETAILS: 

Apparently the psdcmyk device never got updated with the ret_devn_params proc
as did the tiffsep device.


Modified: trunk/gs/src/gdevpsd.c
===================================================================
--- trunk/gs/src/gdevpsd.c	2007-12-11 21:27:02 UTC (rev 8435)
+++ trunk/gs/src/gdevpsd.c	2007-12-11 23:47:18 UTC (rev 8436)
@@ -52,6 +52,7 @@
 static dev_proc_encode_color(psd_encode_compressed_color);
 static dev_proc_decode_color(psd_decode_compressed_color);
 static dev_proc_update_spot_equivalent_colors(psd_update_spot_equivalent_colors);
+static dev_proc_ret_devn_params(psd_ret_devn_params);
 
 /* This is redundant with color_info.cm_name. We may eliminate this
    typedef and use the latter string for everything. */
@@ -195,7 +196,8 @@
 	NULL,				/* fill_linear_color_scanline */\
 	NULL,				/* fill_linear_color_trapezoid */\
 	NULL,				/* fill_linear_color_triangle */\
-	psd_update_spot_equivalent_colors /* update_spot_equivalent_colors */\
+	psd_update_spot_equivalent_colors, /* update_spot_equivalent_colors */\
+	psd_ret_devn_params		/* ret_devn_params */\
 }
 
 
@@ -613,6 +615,17 @@
     return 0;
 }
 
+/*
+ *  Device proc for returning a pointer to DeviceN parameter structure
+ */
+static gs_devn_params *
+psd_ret_devn_params(gx_device * dev)
+{
+    psd_device * pdev = (psd_device *)dev;
+
+    return &pdev->devn_params;
+}
+
 #if ENABLE_ICC_PROFILE
 static int
 psd_open_profile(psd_device *xdev, char *profile_fn, icmLuBase **pluo,