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

[ray at ghostscript.com]

Author: ray
Date: 2007-05-27 22:13:25 -0700 (Sun, 27 May 2007)
New Revision: 8012

Modified:
   trunk/gs/src/gdevdevn.c
Log:
Change names of some functions so that NOPRIVATE still works.


Modified: trunk/gs/src/gdevdevn.c
===================================================================
--- trunk/gs/src/gdevdevn.c	2007-05-27 19:15:04 UTC (rev 8011)
+++ trunk/gs/src/gdevdevn.c	2007-05-28 05:13:25 UTC (rev 8012)
@@ -1826,7 +1826,7 @@
     return length;
 }
 
-private int write_pcx_file(gx_device_printer * pdev, char * filename, int ncomp,
+private int devn_write_pcx_file(gx_device_printer * pdev, char * filename, int ncomp,
 			    int bpc, int pcmlinelength);
 /* 
  * This is an example print page routine for a DeviceN device.  This routine
@@ -1933,14 +1933,14 @@
 
     /* Now convert the bit image files into PCX files */
     if (npcmcolors) {
-	code = write_pcx_file(pdev, (char *) &pdevn->fname,
+	code = devn_write_pcx_file(pdev, (char *) &pdevn->fname,
 				npcmcolors, bpc, pcmlinelength);
 	if (code < 0)
 	    return code;
     }
     for(i = 0; i < nspot; i++) {
 	sprintf(spotname, "%ss%d", pdevn->fname, i);
-	code = write_pcx_file(pdev, spotname, 1, bpc, linelength[i]);
+	code = devn_write_pcx_file(pdev, spotname, 1, bpc, linelength[i]);
 	if (code < 0)
 	    return code;
     }
@@ -2024,8 +2024,8 @@
 
 
 /* Forward declarations */
-private void pcx_write_rle(const byte *, const byte *, int, FILE *);
-private int pcx_write_page(gx_device_printer * pdev, FILE * infile,
+private void devn_pcx_write_rle(const byte *, const byte *, int, FILE *);
+private int devn_pcx_write_page(gx_device_printer * pdev, FILE * infile,
     int linesize, FILE * outfile, pcx_header * phdr, bool planar, int depth);
 
 static const byte pcx_cmyk_palette[16 * 3] =
@@ -2060,7 +2060,7 @@
  *   num_planes - The number of planes.
  */
 private bool
-setup_pcx_header(gx_device_printer * pdev, pcx_header * phdr, int num_planes, int bits_per_plane)
+devn_setup_pcx_header(gx_device_printer * pdev, pcx_header * phdr, int num_planes, int bits_per_plane)
 {
     bool planar = true; /* Invalid cases could cause an indeterminizm. */
  
@@ -2188,7 +2188,7 @@
  *   num_planes - The number of planes.
  */
 private int
-finish_pcx_file(gx_device_printer * pdev, FILE * file, pcx_header * header, int num_planes, int bits_per_plane)
+devn_finish_pcx_file(gx_device_printer * pdev, FILE * file, pcx_header * header, int num_planes, int bits_per_plane)
 {
     switch (num_planes) {
         case 1:
@@ -2262,7 +2262,7 @@
 
 /* Send the page to the printer. */
 private int
-write_pcx_file(gx_device_printer * pdev, char * filename, int ncomp,
+devn_write_pcx_file(gx_device_printer * pdev, char * filename, int ncomp,
 			    int bpc, int linesize)
 {
     pcx_header header;
@@ -2283,10 +2283,10 @@
 	return_error(gs_error_invalidfileaccess);
     }
 
-    planar = setup_pcx_header(pdev, &header, ncomp, bpc);
-    code = pcx_write_page(pdev, in, linesize, out, &header, planar, depth);
+    planar = devn_setup_pcx_header(pdev, &header, ncomp, bpc);
+    code = devn_pcx_write_page(pdev, in, linesize, out, &header, planar, depth);
     if (code >= 0)
-        code = finish_pcx_file(pdev, out, &header, ncomp, bpc);
+        code = devn_finish_pcx_file(pdev, out, &header, ncomp, bpc);
 
     fclose(in);
     fclose(out);
@@ -2297,7 +2297,7 @@
 /* This routine is used for all formats. */
 /* The caller has set header->bpp, nplanes, and palette. */
 private int
-pcx_write_page(gx_device_printer * pdev, FILE * infile, int linesize, FILE * outfile,
+devn_pcx_write_page(gx_device_printer * pdev, FILE * infile, int linesize, FILE * outfile,
 	       pcx_header * phdr, bool planar, int depth)
 {
     int raster = linesize;
@@ -2341,7 +2341,7 @@
 		*end = end[-1];
 		++end;
 	    }
-	    pcx_write_rle(row, end, 1, outfile);
+	    devn_pcx_write_rle(row, end, 1, outfile);
 	} else
 	    switch (depth) {
 
@@ -2371,7 +2371,7 @@
 			    /* We might be one byte short of rsize. */
 			    if (to < pend)
 				*to = to[-1];
-			    pcx_write_rle(plane, pend, 1, outfile);
+			    devn_pcx_write_rle(plane, pend, 1, outfile);
 			}
 		    }
 		    break;
@@ -2381,7 +2381,7 @@
 			int pnum;
 
 			for (pnum = 0; pnum < 3; ++pnum) {
-			    pcx_write_rle(row + pnum, row + raster, 3, outfile);
+			    devn_pcx_write_rle(row + pnum, row + raster, 3, outfile);
 			    if (pdev->width & 1)
 				fputc(0, outfile);		/* pad to even */
 			}
@@ -2406,7 +2406,7 @@
 
 /* Write one line in PCX run-length-encoded format. */
 private void
-pcx_write_rle(const byte * from, const byte * end, int step, FILE * file)
+devn_pcx_write_rle(const byte * from, const byte * end, int step, FILE * file)
 {  /*
     * The PCX format theoretically allows encoding runs of 63
     * identical bytes, but some readers can't handle repetition