[gs-cvs] gs/src

[Dan Coby]

Update of /cvs/ghostscript/gs/src
In directory casper2:/tmp/cvs-serv19814/src

Modified Files:
	gdevdsp.c 
Log Message:
The gdevdsp.c file was missed in the previous commit for the fix for 688192.


Index: gdevdsp.c
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevdsp.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- gdevdsp.c	20 Jun 2005 08:59:23 -0000	1.33
+++ gdevdsp.c	8 Jul 2005 22:06:30 -0000	1.34
@@ -172,7 +172,7 @@
 	return 0;
     }
     else if (index-1 < ddev->devn_params.separations.num_separations)
-        ENUM_RETURN(ddev->devn_params.separations.names[index-1]);
+        ENUM_RETURN(ddev->devn_params.separations.names[index-1].data);
     else
 	return 0;
 ENUM_PTRS_END
@@ -185,7 +185,7 @@
     }
     {   int i;
         for (i = 0; i < ddev->devn_params.separations.num_separations; ++i) {
-            RELOC_PTR(gx_device_display, devn_params.separations.names[i]);
+            RELOC_PTR(gx_device_display, devn_params.separations.names[i].data);
         }
     }
 RELOC_PTRS_END
@@ -1428,10 +1428,10 @@
 	    else {
 		sep_num -= dev->devn_params.num_std_colorant_names;
 		sep_name_size = 
-		    dev->devn_params.separations.names[sep_num]->size;
+		    dev->devn_params.separations.names[sep_num].size;
 		if (sep_name_size > sizeof(name)-2)
 		    sep_name_size = sizeof(name)-1;
-		memcpy(name, dev->devn_params.separations.names[sep_num]->data, 
+		memcpy(name, dev->devn_params.separations.names[sep_num].data, 
 		    sep_name_size);
 		name[sep_name_size] = '\0';
 		if (dev->equiv_cmyk_colors.color[sep_num].color_info_valid) {