[gs-cvs] rev 8250 - in trunk/gs: contrib contrib/eplaser
contrib/japanese contrib/lips4 contrib/opvp doc src
giles at ghostscript.com
giles at ghostscript.com
Tue Sep 25 06:32:56 PDT 2007
Author: giles
Date: 2007-09-25 06:31:24 -0700 (Tue, 25 Sep 2007)
New Revision: 8250
Modified:
trunk/gs/contrib/eplaser/gdevescv.c
trunk/gs/contrib/gdevbjc_.c
trunk/gs/contrib/gdevbjca.c
trunk/gs/contrib/gdevcd8.c
trunk/gs/contrib/gdevdj9.c
trunk/gs/contrib/gdevgdi.c
trunk/gs/contrib/gdevhl12.c
trunk/gs/contrib/gdevln03.c
trunk/gs/contrib/gdevlx32.c
trunk/gs/contrib/gdevlx50.c
trunk/gs/contrib/gdevlx7.c
trunk/gs/contrib/gdevmd2k.c
trunk/gs/contrib/gdevop4w.c
trunk/gs/contrib/gdevxes.c
trunk/gs/contrib/gomni.c
trunk/gs/contrib/japanese/dviprlib.c
trunk/gs/contrib/japanese/dviprlib.h
trunk/gs/contrib/japanese/gdev10v.c
trunk/gs/contrib/japanese/gdevalps.c
trunk/gs/contrib/japanese/gdevdmpr.c
trunk/gs/contrib/japanese/gdevespg.c
trunk/gs/contrib/japanese/gdevfmlbp.c
trunk/gs/contrib/japanese/gdevfmpr.c
trunk/gs/contrib/japanese/gdevj100.c
trunk/gs/contrib/japanese/gdevlbp3.c
trunk/gs/contrib/japanese/gdevmag.c
trunk/gs/contrib/japanese/gdevmjc.c
trunk/gs/contrib/japanese/gdevmjc.h
trunk/gs/contrib/japanese/gdevml6.c
trunk/gs/contrib/japanese/gdevnpdl.c
trunk/gs/contrib/japanese/gdevp201.c
trunk/gs/contrib/japanese/gdevrpdl.c
trunk/gs/contrib/lips4/gdevl4r.c
trunk/gs/contrib/lips4/gdevl4v.c
trunk/gs/contrib/lips4/gdevlips.c
trunk/gs/contrib/lips4/gdevlprn.c
trunk/gs/contrib/opvp/gdevopvp.c
trunk/gs/doc/C-style.htm
trunk/gs/doc/Drivers.htm
trunk/gs/src/Makefile.in
trunk/gs/src/bcwin32.mak
trunk/gs/src/dscparse.c
trunk/gs/src/dscparse.h
trunk/gs/src/dvx-gcc.mak
trunk/gs/src/dwinst.h
trunk/gs/src/dwtrace.c
trunk/gs/src/fapiufst.c
trunk/gs/src/gconf.c
trunk/gs/src/gdev3852.c
trunk/gs/src/gdev3b1.c
trunk/gs/src/gdev4081.c
trunk/gs/src/gdev4693.c
trunk/gs/src/gdev8510.c
trunk/gs/src/gdevabuf.c
trunk/gs/src/gdevadmp.c
trunk/gs/src/gdevatx.c
trunk/gs/src/gdevbbox.c
trunk/gs/src/gdevbit.c
trunk/gs/src/gdevbj10.c
trunk/gs/src/gdevbjcl.c
trunk/gs/src/gdevbmp.c
trunk/gs/src/gdevbmpa.c
trunk/gs/src/gdevbmpc.c
trunk/gs/src/gdevccr.c
trunk/gs/src/gdevcdj.c
trunk/gs/src/gdevcfax.c
trunk/gs/src/gdevcgm.c
trunk/gs/src/gdevcgml.c
trunk/gs/src/gdevcif.c
trunk/gs/src/gdevclj.c
trunk/gs/src/gdevcljc.c
trunk/gs/src/gdevcmap.c
trunk/gs/src/gdevcp50.c
trunk/gs/src/gdevcslw.c
trunk/gs/src/gdevdcrd.c
trunk/gs/src/gdevddrw.c
trunk/gs/src/gdevdevn.c
trunk/gs/src/gdevdfax.c
trunk/gs/src/gdevdflt.c
trunk/gs/src/gdevdgbr.c
trunk/gs/src/gdevdjet.c
trunk/gs/src/gdevdjtc.c
trunk/gs/src/gdevdm24.c
trunk/gs/src/gdevdrop.c
trunk/gs/src/gdevdsp.c
trunk/gs/src/gdevepsc.c
trunk/gs/src/gdevepsn.c
trunk/gs/src/gdevescp.c
trunk/gs/src/gdevfax.c
trunk/gs/src/gdevherc.c
trunk/gs/src/gdevhit.c
trunk/gs/src/gdevhl7x.c
trunk/gs/src/gdevifno.c
trunk/gs/src/gdevijs.c
trunk/gs/src/gdevimdi.c
trunk/gs/src/gdevimgn.c
trunk/gs/src/gdevjbig2.c
trunk/gs/src/gdevjpeg.c
trunk/gs/src/gdevjpx.c
trunk/gs/src/gdevl256.c
trunk/gs/src/gdevl31s.c
trunk/gs/src/gdevlbp8.c
trunk/gs/src/gdevlj56.c
trunk/gs/src/gdevlp8k.c
trunk/gs/src/gdevlxm.c
trunk/gs/src/gdevm1.c
trunk/gs/src/gdevm16.c
trunk/gs/src/gdevm2.c
trunk/gs/src/gdevm24.c
trunk/gs/src/gdevm32.c
trunk/gs/src/gdevm4.c
trunk/gs/src/gdevm40.c
trunk/gs/src/gdevm48.c
trunk/gs/src/gdevm56.c
trunk/gs/src/gdevm64.c
trunk/gs/src/gdevm8.c
trunk/gs/src/gdevmac.c
trunk/gs/src/gdevmac.h
trunk/gs/src/gdevmacxf.c
trunk/gs/src/gdevmeds.c
trunk/gs/src/gdevmem.c
trunk/gs/src/gdevmem.h
trunk/gs/src/gdevmgr.c
trunk/gs/src/gdevmiff.c
trunk/gs/src/gdevmpla.c
trunk/gs/src/gdevmr2n.c
trunk/gs/src/gdevmrun.c
trunk/gs/src/gdevmswn.c
trunk/gs/src/gdevmsxf.c
trunk/gs/src/gdevn533.c
trunk/gs/src/gdevnfwd.c
trunk/gs/src/gdevo182.c
trunk/gs/src/gdevokii.c
trunk/gs/src/gdevos2p.c
trunk/gs/src/gdevp14.c
trunk/gs/src/gdevp2up.c
trunk/gs/src/gdevpbm.c
trunk/gs/src/gdevpcfb.c
trunk/gs/src/gdevpcx.c
trunk/gs/src/gdevpdf.c
trunk/gs/src/gdevpdfb.c
trunk/gs/src/gdevpdfc.c
trunk/gs/src/gdevpdfd.c
trunk/gs/src/gdevpdfe.c
trunk/gs/src/gdevpdfg.c
trunk/gs/src/gdevpdfi.c
trunk/gs/src/gdevpdfj.c
trunk/gs/src/gdevpdfk.c
trunk/gs/src/gdevpdfm.c
trunk/gs/src/gdevpdfo.c
trunk/gs/src/gdevpdfp.c
trunk/gs/src/gdevpdfr.c
trunk/gs/src/gdevpdft.c
trunk/gs/src/gdevpdfu.c
trunk/gs/src/gdevpdfv.c
trunk/gs/src/gdevpdtb.c
trunk/gs/src/gdevpdtc.c
trunk/gs/src/gdevpdtd.c
trunk/gs/src/gdevpdte.c
trunk/gs/src/gdevpdtf.c
trunk/gs/src/gdevpdti.c
trunk/gs/src/gdevpdts.c
trunk/gs/src/gdevpdtt.c
trunk/gs/src/gdevpdtw.c
trunk/gs/src/gdevpe.c
trunk/gs/src/gdevperm.c
trunk/gs/src/gdevphex.c
trunk/gs/src/gdevpipe.c
trunk/gs/src/gdevpjet.c
trunk/gs/src/gdevplnx.c
trunk/gs/src/gdevpm.c
trunk/gs/src/gdevpng.c
trunk/gs/src/gdevpnga.c
trunk/gs/src/gdevppla.c
trunk/gs/src/gdevprn.c
trunk/gs/src/gdevprn.h
trunk/gs/src/gdevprna.c
trunk/gs/src/gdevps.c
trunk/gs/src/gdevpsd.c
trunk/gs/src/gdevpsdi.c
trunk/gs/src/gdevpsdp.c
trunk/gs/src/gdevpsds.c
trunk/gs/src/gdevpsdu.c
trunk/gs/src/gdevpsf1.c
trunk/gs/src/gdevpsf2.c
trunk/gs/src/gdevpsfm.c
trunk/gs/src/gdevpsft.c
trunk/gs/src/gdevpsfu.c
trunk/gs/src/gdevpsfx.c
trunk/gs/src/gdevpsim.c
trunk/gs/src/gdevpsu.c
trunk/gs/src/gdevpx.c
trunk/gs/src/gdevrinkj.c
trunk/gs/src/gdevrops.c
trunk/gs/src/gdevs3ga.c
trunk/gs/src/gdevsco.c
trunk/gs/src/gdevsgi.c
trunk/gs/src/gdevsj48.c
trunk/gs/src/gdevsnfb.c
trunk/gs/src/gdevsppr.c
trunk/gs/src/gdevstc.c
trunk/gs/src/gdevstc4.c
trunk/gs/src/gdevsun.c
trunk/gs/src/gdevsunr.c
trunk/gs/src/gdevsvga.c
trunk/gs/src/gdevtfax.c
trunk/gs/src/gdevtfnx.c
trunk/gs/src/gdevtifs.c
trunk/gs/src/gdevtknk.c
trunk/gs/src/gdevtrac.c
trunk/gs/src/gdevtsep.c
trunk/gs/src/gdevupd.c
trunk/gs/src/gdevvec.c
trunk/gs/src/gdevvglb.c
trunk/gs/src/gdevwddb.c
trunk/gs/src/gdevwdib.c
trunk/gs/src/gdevwpr2.c
trunk/gs/src/gdevwprn.c
trunk/gs/src/gdevwts.c
trunk/gs/src/gdevx.c
trunk/gs/src/gdevxalt.c
trunk/gs/src/gdevxcf.c
trunk/gs/src/gdevxcmp.c
trunk/gs/src/gdevxini.c
trunk/gs/src/gdevxxf.c
trunk/gs/src/genarch.c
trunk/gs/src/genconf.c
trunk/gs/src/genht.c
trunk/gs/src/geninit.c
trunk/gs/src/gp_dosfe.c
trunk/gs/src/gp_iwatc.c
trunk/gs/src/gp_macio.c
trunk/gs/src/gp_mshdl.c
trunk/gs/src/gp_msprn.c
trunk/gs/src/gp_mswin.c
trunk/gs/src/gp_ntfs.c
trunk/gs/src/gp_os2.c
trunk/gs/src/gp_os2pr.c
trunk/gs/src/gp_os9.c
trunk/gs/src/gp_psync.c
trunk/gs/src/gp_unifs.c
trunk/gs/src/gp_unix_cache.c
trunk/gs/src/gp_vms.c
trunk/gs/src/gp_wsync.c
trunk/gs/src/gpmisc.c
trunk/gs/src/gs.c
trunk/gs/src/gsalloc.c
trunk/gs/src/gsalphac.c
trunk/gs/src/gscdevn.c
trunk/gs/src/gschar.c
trunk/gs/src/gschar0.c
trunk/gs/src/gscicach.c
trunk/gs/src/gscie.c
trunk/gs/src/gsciemap.c
trunk/gs/src/gsclipsr.c
trunk/gs/src/gscolor.c
trunk/gs/src/gscolor2.c
trunk/gs/src/gscoord.c
trunk/gs/src/gscparam.c
trunk/gs/src/gscpixel.c
trunk/gs/src/gscrd.c
trunk/gs/src/gscrdp.c
trunk/gs/src/gscscie.c
trunk/gs/src/gscsepr.c
trunk/gs/src/gscspace.c
trunk/gs/src/gsdevice.c
trunk/gs/src/gsdll.c
trunk/gs/src/gsdparam.c
trunk/gs/src/gsdps.c
trunk/gs/src/gsdps1.c
trunk/gs/src/gsdsrc.c
trunk/gs/src/gsequivc.c
trunk/gs/src/gserver.c
trunk/gs/src/gsfcid.c
trunk/gs/src/gsfcid2.c
trunk/gs/src/gsfcmap.c
trunk/gs/src/gsfcmap1.c
trunk/gs/src/gsflip.c
trunk/gs/src/gsfont.c
trunk/gs/src/gsfont0.c
trunk/gs/src/gsfont0c.c
trunk/gs/src/gsfunc0.c
trunk/gs/src/gsfunc3.c
trunk/gs/src/gsfunc4.c
trunk/gs/src/gsgcache.c
trunk/gs/src/gsgdata.c
trunk/gs/src/gshsb.c
trunk/gs/src/gsht.c
trunk/gs/src/gsht1.c
trunk/gs/src/gshtscr.c
trunk/gs/src/gshtx.c
trunk/gs/src/gsicc.c
trunk/gs/src/gsimage.c
trunk/gs/src/gsimpath.c
trunk/gs/src/gsiodev.c
trunk/gs/src/gsiodevs.c
trunk/gs/src/gsiodisk.c
trunk/gs/src/gsiomacres.c
trunk/gs/src/gsiorom.c
trunk/gs/src/gsistate.c
trunk/gs/src/gslib.c
trunk/gs/src/gsmalloc.c
trunk/gs/src/gsmatrix.c
trunk/gs/src/gsmemlok.c
trunk/gs/src/gsmemory.c
trunk/gs/src/gsmemret.c
trunk/gs/src/gsmisc.c
trunk/gs/src/gsncdummy.c
trunk/gs/src/gsnogc.c
trunk/gs/src/gsnotify.c
trunk/gs/src/gsovrc.c
trunk/gs/src/gspaint.c
trunk/gs/src/gsparam.c
trunk/gs/src/gsparam2.c
trunk/gs/src/gsparams.c
trunk/gs/src/gspath.c
trunk/gs/src/gspath1.c
trunk/gs/src/gspcolor.c
trunk/gs/src/gsptype1.c
trunk/gs/src/gsptype2.c
trunk/gs/src/gsropc.c
trunk/gs/src/gsroptab.c
trunk/gs/src/gsshade.c
trunk/gs/src/gsstate.c
trunk/gs/src/gsstruct.h
trunk/gs/src/gstext.c
trunk/gs/src/gstrans.c
trunk/gs/src/gstrap.c
trunk/gs/src/gstype2.c
trunk/gs/src/gstype42.c
trunk/gs/src/gswts.c
trunk/gs/src/gxacpath.c
trunk/gs/src/gxccache.c
trunk/gs/src/gxccman.c
trunk/gs/src/gxchar.c
trunk/gs/src/gxcht.c
trunk/gs/src/gxclbits.c
trunk/gs/src/gxclfile.c
trunk/gs/src/gxclimag.c
trunk/gs/src/gxclip.c
trunk/gs/src/gxclip2.c
trunk/gs/src/gxclipm.c
trunk/gs/src/gxclist.c
trunk/gs/src/gxcllzw.c
trunk/gs/src/gxclmem.c
trunk/gs/src/gxclpath.c
trunk/gs/src/gxclrast.c
trunk/gs/src/gxclread.c
trunk/gs/src/gxclrect.c
trunk/gs/src/gxclutil.c
trunk/gs/src/gxclzlib.c
trunk/gs/src/gxcmap.c
trunk/gs/src/gxcpath.c
trunk/gs/src/gxctable.c
trunk/gs/src/gxdcolor.c
trunk/gs/src/gxdevcli.h
trunk/gs/src/gxdevndi.c
trunk/gs/src/gxdhtserial.c
trunk/gs/src/gxfapiu.c
trunk/gs/src/gxfcopy.c
trunk/gs/src/gxfdrop.c
trunk/gs/src/gxfill.c
trunk/gs/src/gxfillsl.h
trunk/gs/src/gxfilltr.h
trunk/gs/src/gxfillts.h
trunk/gs/src/gxhintn.c
trunk/gs/src/gxhintn1.c
trunk/gs/src/gxht.c
trunk/gs/src/gxhtbit.c
trunk/gs/src/gxi12bit.c
trunk/gs/src/gxi16bit.c
trunk/gs/src/gxicolor.c
trunk/gs/src/gxidata.c
trunk/gs/src/gxifast.c
trunk/gs/src/gximag3x.c
trunk/gs/src/gximage.c
trunk/gs/src/gximage1.c
trunk/gs/src/gximage2.c
trunk/gs/src/gximage3.c
trunk/gs/src/gximage4.c
trunk/gs/src/gximono.c
trunk/gs/src/gxipixel.c
trunk/gs/src/gxiscale.c
trunk/gs/src/gxmclip.c
trunk/gs/src/gxoprect.c
trunk/gs/src/gxp1fill.c
trunk/gs/src/gxpageq.c
trunk/gs/src/gxpaint.c
trunk/gs/src/gxpath.c
trunk/gs/src/gxpcmap.c
trunk/gs/src/gxpcopy.c
trunk/gs/src/gxpdash.c
trunk/gs/src/gxpflat.c
trunk/gs/src/gxshade.c
trunk/gs/src/gxshade1.c
trunk/gs/src/gxshade4.c
trunk/gs/src/gxshade6.c
trunk/gs/src/gxstroke.c
trunk/gs/src/gxttfb.c
trunk/gs/src/gxtype1.c
trunk/gs/src/gxwts.c
trunk/gs/src/gxxfont.h
trunk/gs/src/gzpath.h
trunk/gs/src/gzspotan.c
trunk/gs/src/ialloc.c
trunk/gs/src/iccfont.c
trunk/gs/src/icfontab.c
trunk/gs/src/icontext.c
trunk/gs/src/idebug.c
trunk/gs/src/idict.c
trunk/gs/src/idstack.c
trunk/gs/src/ifont.h
trunk/gs/src/igc.c
trunk/gs/src/igcref.c
trunk/gs/src/igcstr.c
trunk/gs/src/iinit.c
trunk/gs/src/ilocate.c
trunk/gs/src/imain.c
trunk/gs/src/imainarg.c
trunk/gs/src/iname.c
trunk/gs/src/interp.c
trunk/gs/src/iparam.c
trunk/gs/src/iplugin.c
trunk/gs/src/ireclaim.c
trunk/gs/src/isave.c
trunk/gs/src/iscan.c
trunk/gs/src/iscanbin.c
trunk/gs/src/istack.c
trunk/gs/src/iutil.c
trunk/gs/src/iutil2.c
trunk/gs/src/macosx.mak
trunk/gs/src/msvc32.mak
trunk/gs/src/msvccmd.mak
trunk/gs/src/msvclib.mak
trunk/gs/src/os2.mak
trunk/gs/src/sa85d.c
trunk/gs/src/sarc4.c
trunk/gs/src/sbcp.c
trunk/gs/src/sbhc.c
trunk/gs/src/sbwbs.c
trunk/gs/src/scfd.c
trunk/gs/src/scfdgen.c
trunk/gs/src/scfe.c
trunk/gs/src/scfparam.c
trunk/gs/src/sdcparam.c
trunk/gs/src/sdctd.c
trunk/gs/src/sdcte.c
trunk/gs/src/sdeparam.c
trunk/gs/src/seexec.c
trunk/gs/src/sfilter1.c
trunk/gs/src/sfilter2.c
trunk/gs/src/sfxfd.c
trunk/gs/src/sfxstdio.c
trunk/gs/src/shcgen.c
trunk/gs/src/sidscale.c
trunk/gs/src/siinterp.c
trunk/gs/src/simscale.c
trunk/gs/src/siscale.c
trunk/gs/src/sjbig2.c
trunk/gs/src/sjbig2.h
trunk/gs/src/sjbig2_luratech.c
trunk/gs/src/sjbig2_luratech.h
trunk/gs/src/sjpegc.c
trunk/gs/src/sjpx.c
trunk/gs/src/sjpx_luratech.c
trunk/gs/src/slzwd.c
trunk/gs/src/slzwe.c
trunk/gs/src/smd5.c
trunk/gs/src/smtf.c
trunk/gs/src/spdiff.c
trunk/gs/src/spngp.c
trunk/gs/src/spprint.c
trunk/gs/src/spsdf.c
trunk/gs/src/srld.c
trunk/gs/src/srle.c
trunk/gs/src/sstring.c
trunk/gs/src/stdpre.h
trunk/gs/src/stream.c
trunk/gs/src/szlibd.c
trunk/gs/src/szlibe.c
trunk/gs/src/ttcalc.c
trunk/gs/src/ttfmain.c
trunk/gs/src/ttfmemd.c
trunk/gs/src/unix-gcc.mak
trunk/gs/src/unixansi.mak
trunk/gs/src/vdtrace.c
trunk/gs/src/watclib.mak
trunk/gs/src/watcw32.mak
trunk/gs/src/wccommon.mak
trunk/gs/src/x_.h
trunk/gs/src/zalg.c
trunk/gs/src/zarith.c
trunk/gs/src/zarray.c
trunk/gs/src/zbfont.c
trunk/gs/src/zbseq.c
trunk/gs/src/zcfont.c
trunk/gs/src/zchar.c
trunk/gs/src/zchar1.c
trunk/gs/src/zchar2.c
trunk/gs/src/zchar32.c
trunk/gs/src/zchar42.c
trunk/gs/src/zcharout.c
trunk/gs/src/zcharx.c
trunk/gs/src/zcid.c
trunk/gs/src/zcidtest.c
trunk/gs/src/zcie.c
trunk/gs/src/zcolor.c
trunk/gs/src/zcolor1.c
trunk/gs/src/zcolor2.c
trunk/gs/src/zcolor3.c
trunk/gs/src/zcontext.c
trunk/gs/src/zcontrol.c
trunk/gs/src/zcrd.c
trunk/gs/src/zcsdevn.c
trunk/gs/src/zcsindex.c
trunk/gs/src/zcspixel.c
trunk/gs/src/zcssepr.c
trunk/gs/src/zdevcal.c
trunk/gs/src/zdevice.c
trunk/gs/src/zdevice2.c
trunk/gs/src/zdfilter.c
trunk/gs/src/zdict.c
trunk/gs/src/zdosio.c
trunk/gs/src/zdouble.c
trunk/gs/src/zdpnext.c
trunk/gs/src/zdps.c
trunk/gs/src/zdps1.c
trunk/gs/src/zdscpars.c
trunk/gs/src/zfapi.c
trunk/gs/src/zfarc4.c
trunk/gs/src/zfbcp.c
trunk/gs/src/zfcid0.c
trunk/gs/src/zfcid1.c
trunk/gs/src/zfcmap.c
trunk/gs/src/zfdctd.c
trunk/gs/src/zfdcte.c
trunk/gs/src/zfdecode.c
trunk/gs/src/zfile.c
trunk/gs/src/zfile1.c
trunk/gs/src/zfileio.c
trunk/gs/src/zfilter.c
trunk/gs/src/zfilter2.c
trunk/gs/src/zfilterx.c
trunk/gs/src/zfimscale.c
trunk/gs/src/zfjbig2.c
trunk/gs/src/zfjpx.c
trunk/gs/src/zfmd5.c
trunk/gs/src/zfont.c
trunk/gs/src/zfont0.c
trunk/gs/src/zfont1.c
trunk/gs/src/zfont2.c
trunk/gs/src/zfont32.c
trunk/gs/src/zfont42.c
trunk/gs/src/zfontenum.c
trunk/gs/src/zfproc.c
trunk/gs/src/zfrsd.c
trunk/gs/src/zfsample.c
trunk/gs/src/zfunc.c
trunk/gs/src/zfunc4.c
trunk/gs/src/zfzlib.c
trunk/gs/src/zgeneric.c
trunk/gs/src/zgstate.c
trunk/gs/src/zhsb.c
trunk/gs/src/zht.c
trunk/gs/src/zht1.c
trunk/gs/src/zht2.c
trunk/gs/src/zicc.c
trunk/gs/src/zimage.c
trunk/gs/src/zimage3.c
trunk/gs/src/ziodev.c
trunk/gs/src/ziodev2.c
trunk/gs/src/ziodevs.c
trunk/gs/src/ziodevsc.c
trunk/gs/src/zmath.c
trunk/gs/src/zmatrix.c
trunk/gs/src/zmedia2.c
trunk/gs/src/zmisc.c
trunk/gs/src/zmisc1.c
trunk/gs/src/zmisc2.c
trunk/gs/src/zmisc3.c
trunk/gs/src/zncdummy.c
trunk/gs/src/zpacked.c
trunk/gs/src/zpaint.c
trunk/gs/src/zpath.c
trunk/gs/src/zpath1.c
trunk/gs/src/zpcolor.c
trunk/gs/src/zrelbit.c
trunk/gs/src/zrop.c
trunk/gs/src/zshade.c
trunk/gs/src/zstack.c
trunk/gs/src/zstring.c
trunk/gs/src/zsysvm.c
trunk/gs/src/ztoken.c
trunk/gs/src/ztrans.c
trunk/gs/src/ztrap.c
trunk/gs/src/ztype.c
trunk/gs/src/zupath.c
trunk/gs/src/zusparam.c
trunk/gs/src/zvmem.c
trunk/gs/src/zvmem2.c
Log:
Replace the 'private' define with the now standard C keyword 'static'.
DETAILS:
The compilers we support have supported static for some time now, so
idiomatic, and removes one of the obstacles to compiling Ghostscript
as C++.
The patch also removes support for compilation with -dNOPRIVATE, which
is not longer necessary with modern debuggers.
Modified: trunk/gs/contrib/eplaser/gdevescv.c
===================================================================
--- trunk/gs/contrib/eplaser/gdevescv.c 2007-09-24 03:52:18 UTC (rev 8249)
+++ trunk/gs/contrib/eplaser/gdevescv.c 2007-09-25 13:31:24 UTC (rev 8250)
@@ -89,15 +89,15 @@
/* ---------------- Device definition ---------------- */
/* Device procedures */
-private dev_proc_open_device(escv_open);
-private dev_proc_output_page(escv_output_page);
-private dev_proc_close_device(escv_close);
-private dev_proc_copy_mono(escv_copy_mono);
-private dev_proc_copy_color(escv_copy_color);
-private dev_proc_put_params(escv_put_params);
-private dev_proc_get_params(escv_get_params);
-private dev_proc_fill_mask(escv_fill_mask);
-private dev_proc_begin_image(escv_begin_image);
+static dev_proc_open_device(escv_open);
+static dev_proc_output_page(escv_output_page);
+static dev_proc_close_device(escv_close);
+static dev_proc_copy_mono(escv_copy_mono);
+static dev_proc_copy_color(escv_copy_color);
+static dev_proc_put_params(escv_put_params);
+static dev_proc_get_params(escv_get_params);
+static dev_proc_fill_mask(escv_fill_mask);
+static dev_proc_begin_image(escv_begin_image);
gs_public_st_suffix_add0_final(st_device_escv, gx_device_escv,
@@ -342,82 +342,82 @@
/* Vector device implementation */
#if ( 6 > GS_VERSION_MAJOR )
-private int escv_beginpage(P1(gx_device_vector * vdev));
-private int escv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
-private int escv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
-private int escv_setdash(P4(gx_device_vector * vdev, const float *pattern,
+static int escv_beginpage(P1(gx_device_vector * vdev));
+static int escv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
+static int escv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
+static int escv_setdash(P4(gx_device_vector * vdev, const float *pattern,
uint count, floatp offset));
-private int escv_setflat(P2(gx_device_vector * vdev, floatp flatness));
-private int escv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop,
+static int escv_setflat(P2(gx_device_vector * vdev, floatp flatness));
+static int escv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop,
gs_logical_operation_t diff));
-private int escv_vector_dorect(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1,
+static int escv_vector_dorect(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1,
fixed y1, gx_path_type_t type);
-private int escv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath,
+static int escv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath,
gx_path_type_t type);
-private int escv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
-private int escv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
+static int escv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
+static int escv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
floatp x, floatp y, gx_path_type_t type));
-private int escv_lineto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
+static int escv_lineto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
floatp x, floatp y, gx_path_type_t type));
-private int escv_curveto(P10(gx_device_vector * vdev, floatp x0, floatp y0,
+static int escv_curveto(P10(gx_device_vector * vdev, floatp x0, floatp y0,
floatp x1, floatp y1, floatp x2, floatp y2,
floatp x3, floatp y3, gx_path_type_t type));
-private int escv_closepath(P6(gx_device_vector * vdev, floatp x, floatp y,
+static int escv_closepath(P6(gx_device_vector * vdev, floatp x, floatp y,
floatp x_start, floatp y_start, gx_path_type_t type));
-private int escv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
-private int escv_setlinewidth(gx_device_vector * vdev, floatp width);
-private int escv_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
-private int escv_setlinejoin(gx_device_vector * vdev, gs_line_join join);
-private int escv_setmiterlimit(gx_device_vector * vdev, floatp limit);
+static int escv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
+static int escv_setlinewidth(gx_device_vector * vdev, floatp width);
+static int escv_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
+static int escv_setlinejoin(gx_device_vector * vdev, gs_line_join join);
+static int escv_setmiterlimit(gx_device_vector * vdev, floatp limit);
#else /* 6 <= GS_VERSION_MAJOR */
/* Page management */
-private int escv_beginpage (gx_device_vector * vdev);
+static int escv_beginpage (gx_device_vector * vdev);
/* Imager state */
-private int escv_setlinewidth (gx_device_vector * vdev, floatp width);
-private int escv_setlinecap (gx_device_vector * vdev, gs_line_cap cap);
-private int escv_setlinejoin (gx_device_vector * vdev, gs_line_join join);
-private int escv_setmiterlimit (gx_device_vector * vdev, floatp limit);
-private int escv_setdash (gx_device_vector * vdev, const float *pattern,
+static int escv_setlinewidth (gx_device_vector * vdev, floatp width);
+static int escv_setlinecap (gx_device_vector * vdev, gs_line_cap cap);
+static int escv_setlinejoin (gx_device_vector * vdev, gs_line_join join);
+static int escv_setmiterlimit (gx_device_vector * vdev, floatp limit);
+static int escv_setdash (gx_device_vector * vdev, const float *pattern,
uint count, floatp offset);
-private int escv_setflat (gx_device_vector * vdev, floatp flatness);
-private int escv_setlogop (gx_device_vector * vdev, gs_logical_operation_t lop,
+static int escv_setflat (gx_device_vector * vdev, floatp flatness);
+static int escv_setlogop (gx_device_vector * vdev, gs_logical_operation_t lop,
gs_logical_operation_t diff);
/* Other state */
#if ( 8 <= GS_VERSION_MAJOR )
-private bool escv_can_handle_hl_color (gx_device_vector * vdev, const gs_imager_state * pis,
+static bool escv_can_handle_hl_color (gx_device_vector * vdev, const gs_imager_state * pis,
const gx_drawing_color * pdc);
-private int escv_setfillcolor (gx_device_vector * vdev, const gs_imager_state * pis,
+static int escv_setfillcolor (gx_device_vector * vdev, const gs_imager_state * pis,
const gx_drawing_color * pdc);
-private int escv_setstrokecolor (gx_device_vector * vdev, const gs_imager_state * pis,
+static int escv_setstrokecolor (gx_device_vector * vdev, const gs_imager_state * pis,
const gx_drawing_color * pdc);
#else
-private int escv_setfillcolor (gx_device_vector * vdev, const gx_drawing_color * pdc);
-private int escv_setstrokecolor (gx_device_vector * vdev, const gx_drawing_color * pdc);
+static int escv_setfillcolor (gx_device_vector * vdev, const gx_drawing_color * pdc);
+static int escv_setstrokecolor (gx_device_vector * vdev, const gx_drawing_color * pdc);
#endif
/* Paths */
/* dopath and dorect are normally defaulted */
-private int escv_vector_dopath (gx_device_vector * vdev, const gx_path * ppath,
+static int escv_vector_dopath (gx_device_vector * vdev, const gx_path * ppath,
gx_path_type_t type, const gs_matrix *pmat);
-private int escv_vector_dorect (gx_device_vector * vdev, fixed x0, fixed y0, fixed x1,
+static int escv_vector_dorect (gx_device_vector * vdev, fixed x0, fixed y0, fixed x1,
fixed y1, gx_path_type_t type);
-private int escv_beginpath (gx_device_vector * vdev, gx_path_type_t type);
-private int escv_moveto (gx_device_vector * vdev, floatp x0, floatp y0,
+static int escv_beginpath (gx_device_vector * vdev, gx_path_type_t type);
+static int escv_moveto (gx_device_vector * vdev, floatp x0, floatp y0,
floatp x, floatp y, gx_path_type_t type);
-private int escv_lineto (gx_device_vector * vdev, floatp x0, floatp y0,
+static int escv_lineto (gx_device_vector * vdev, floatp x0, floatp y0,
floatp x, floatp y, gx_path_type_t type);
-private int escv_curveto (gx_device_vector * vdev, floatp x0, floatp y0,
+static int escv_curveto (gx_device_vector * vdev, floatp x0, floatp y0,
floatp x1, floatp y1, floatp x2, floatp y2,
floatp x3, floatp y3, gx_path_type_t type);
-private int escv_closepath (gx_device_vector * vdev, floatp x0, floatp y0,
+static int escv_closepath (gx_device_vector * vdev, floatp x0, floatp y0,
floatp x_start, floatp y_start, gx_path_type_t type);
-private int escv_endpath (gx_device_vector * vdev, gx_path_type_t type);
+static int escv_endpath (gx_device_vector * vdev, gx_path_type_t type);
#endif /* GS_VERSION_MAJOR */
-private const gx_device_vector_procs escv_vector_procs =
+static const gx_device_vector_procs escv_vector_procs =
{
/* Page management */
escv_beginpage,
@@ -446,16 +446,16 @@
escv_endpath
};
-private void escv_write_begin(gx_device *dev, int bits, int x, int y, int sw, int sh, int dw, int dh, int roll);
-private void escv_write_data(gx_device *dev, int bits, char *buf, int bsize, int w, int ras);
-private void escv_write_end(gx_device *dev, int bits);
+static void escv_write_begin(gx_device *dev, int bits, int x, int y, int sw, int sh, int dw, int dh, int roll);
+static void escv_write_data(gx_device *dev, int bits, char *buf, int bsize, int w, int ras);
+static void escv_write_end(gx_device *dev, int bits);
/* ---------------- Utilities ---------------- */
/* Put a string on a stream.
This function is copy of `pputs' in gdevpstr.c */
-private int
+static int
lputs(stream * s, const char *str)
{
uint len = strlen(str);
@@ -468,7 +468,7 @@
}
/* Write a string on a stream. */
-private void
+static void
put_bytes(stream * s, const byte * data, uint count)
{
uint used;
@@ -477,7 +477,7 @@
}
-private int
+static int
escv_range_check(gx_device * dev)
{
int width = dev->MediaSize[0];
@@ -518,7 +518,7 @@
/* ---------------- Vector device implementation ---------------- */
-private int
+static int
escv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath,
gx_path_type_t type
#if ( 6 <= GS_VERSION_MAJOR )
@@ -639,7 +639,7 @@
}
-private int
+static int
escv_vector_dorect(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1,
fixed y1, gx_path_type_t type)
{
@@ -676,7 +676,7 @@
/* ---------- */
-private const EPaperTable ePaperTable[NUM_OF_PAPER_TABLES] =
+static const EPaperTable ePaperTable[NUM_OF_PAPER_TABLES] =
{
{933, 1369, 72, "A3PLUS"}, /* A3 NOBI */
{842, 1191, 13, "A3"}, /* A3 */
@@ -703,7 +703,7 @@
{ 0, 0, -1, ""} /* Undefined */
};
-private const EPaperTable *
+static const EPaperTable *
escv_checkpapersize(gx_device_vector * vdev)
{
gx_device_escv *const pdev = (gx_device_escv *)vdev;
@@ -837,7 +837,7 @@
}
}
-private char *
+static char *
get_sysname ( void )
{
char *result = NULL;
@@ -855,7 +855,7 @@
1 completed.
-1 error. ... This value not return now.
*/
-private int
+static int
trans_modelname ( char *dest, const char * src, size_t dest_len )
{
const char *cp = src;
@@ -893,7 +893,7 @@
}
-private int
+static int
escv_beginpage(gx_device_vector * vdev)
{
gx_device_escv *const pdev = (gx_device_escv *)vdev;
@@ -1297,7 +1297,7 @@
}
-private int
+static int
escv_setlinewidth(gx_device_vector * vdev, floatp width)
{
stream *s = gdev_vector_stream(vdev);
@@ -1332,7 +1332,7 @@
}
-private int
+static int
escv_setlinecap(gx_device_vector * vdev, gs_line_cap cap)
{
stream *s = gdev_vector_stream(vdev);
@@ -1354,7 +1354,7 @@
}
-private int
+static int
escv_setlinejoin(gx_device_vector * vdev, gs_line_join join)
{
stream *s = gdev_vector_stream(vdev);
@@ -1386,7 +1386,7 @@
}
-private int
+static int
escv_setmiterlimit(gx_device_vector * vdev, floatp limit)
{
stream *s = gdev_vector_stream(vdev);
@@ -1414,7 +1414,7 @@
#if ( 8 <= GS_VERSION_MAJOR )
-private bool
+static bool
escv_can_handle_hl_color(gx_device_vector * vdev, const gs_imager_state * pis,
const gx_drawing_color * pdc)
{
@@ -1423,7 +1423,7 @@
#endif
-private int
+static int
escv_setfillcolor(gx_device_vector * vdev,
#if ( 8 <= GS_VERSION_MAJOR )
const gs_imager_state * pis,
@@ -1468,7 +1468,7 @@
}
-private int
+static int
escv_setstrokecolor(gx_device_vector * vdev,
#if ( 8 <= GS_VERSION_MAJOR )
const gs_imager_state * pis,
@@ -1517,7 +1517,7 @@
/* Àþ¼ï»ØÄêÌ¿Îá */
-private int
+static int
escv_setdash(gx_device_vector * vdev, const float *pattern, uint count, floatp offset)
{
stream *s = gdev_vector_stream(vdev);
@@ -1580,14 +1580,14 @@
/* ¥Ñ¥¹Ê¿³êÅÙ»ØÄê */
-private int
+static int
escv_setflat(gx_device_vector * vdev, floatp flatness)
{
return 0;
}
-private int
+static int
escv_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
gs_logical_operation_t diff)
{
@@ -1596,7 +1596,7 @@
}
-private int
+static int
escv_beginpath(gx_device_vector * vdev, gx_path_type_t type)
{
stream *s = gdev_vector_stream(vdev);
@@ -1614,7 +1614,7 @@
}
-private int
+static int
escv_moveto(gx_device_vector * vdev,
floatp x0, floatp y0, floatp x1, floatp y1, gx_path_type_t type)
{
@@ -1629,7 +1629,7 @@
}
-private int
+static int
escv_lineto(gx_device_vector * vdev,
floatp x0, floatp y0, floatp x1, floatp y1, gx_path_type_t type)
{
@@ -1645,7 +1645,7 @@
}
-private int
+static int
escv_curveto(gx_device_vector * vdev, floatp x0, floatp y0,
floatp x1, floatp y1, floatp x2, floatp y2, floatp x3, floatp y3,
gx_path_type_t type)
@@ -1664,7 +1664,7 @@
}
-private int
+static int
escv_closepath(gx_device_vector * vdev, floatp x, floatp y,
floatp x_start, floatp y_start, gx_path_type_t type)
{
@@ -1675,7 +1675,7 @@
}
-private int
+static int
escv_endpath(gx_device_vector * vdev, gx_path_type_t type)
{
stream *s = gdev_vector_stream(vdev);
@@ -1720,7 +1720,7 @@
/* ------ Open/close/page ------ */
/* Open the device. */
-private int
+static int
escv_open(gx_device * dev)
{
gx_device_vector *const vdev = (gx_device_vector *) dev;
@@ -1770,7 +1770,7 @@
/* Wrap up ("output") a page. */
-private int
+static int
escv_output_page(gx_device * dev, int num_copies, int flush)
{
gx_device_vector *const vdev = (gx_device_vector *) dev;
@@ -1790,7 +1790,7 @@
}
-private int
+static int
escv_close(gx_device *dev)
{
gx_device_vector *const vdev = (gx_device_vector *) dev;
@@ -1811,7 +1811,7 @@
/* ---------------- Get/put parameters ---------------- */
-private int
+static int
escv_get_str_param( gs_param_list * plist, gs_param_name key, gs_param_string *pgsstr, int code )
{
int ncode;
@@ -1825,7 +1825,7 @@
}
/* Get parameters. */
-private int
+static int
escv_get_params(gx_device * dev, gs_param_list * plist)
{
gx_device_escv *const pdev = (gx_device_escv *) dev;
@@ -1878,7 +1878,7 @@
}
-private int
+static int
escv_set_str_param( gs_param_list * plist, const char * key, char *strvalue, int bufmax, int ecode )
{
gs_param_name param_name;
@@ -1902,7 +1902,7 @@
}
/* Put parameters. */
-private int
+static int
escv_put_params(gx_device * dev, gs_param_list * plist)
{
gx_device_escv *const pdev = (gx_device_escv *) dev;
@@ -2074,7 +2074,7 @@
/* ---------------- Images ---------------- */
-private int
+static int
escv_copy_mono(gx_device * dev, const byte * data,
int data_x, int raster, gx_bitmap_id id, int x, int y, int w, int h,
gx_color_index zero, gx_color_index one)
@@ -2239,7 +2239,7 @@
/* Copy a color bitmap. */
-private int
+static int
escv_copy_color(gx_device * dev,
const byte * data, int data_x, int raster, gx_bitmap_id id,
int x, int y, int w, int h)
@@ -2287,7 +2287,7 @@
/* Fill a mask. */
-private int
+static int
escv_fill_mask(gx_device * dev,
const byte * data, int data_x, int raster, gx_bitmap_id id,
int x, int y, int w, int h,
@@ -2404,16 +2404,16 @@
/* ---------------- High-level images ---------------- */
-private image_enum_proc_plane_data(escv_image_plane_data);
-private image_enum_proc_end_image(escv_image_end_image);
-private const gx_image_enum_procs_t escv_image_enum_procs =
+static image_enum_proc_plane_data(escv_image_plane_data);
+static image_enum_proc_end_image(escv_image_end_image);
+static const gx_image_enum_procs_t escv_image_enum_procs =
{
escv_image_plane_data, escv_image_end_image
};
/* Start processing an image. */
-private int
+static int
escv_begin_image(gx_device * dev,
const gs_imager_state * pis, const gs_image_t * pim,
gs_image_format_t format, const gs_int_rect * prect,
@@ -2587,7 +2587,7 @@
/* Process the next piece of an image. */
-private int
+static int
#if GS_VERSION_MAJOR >= 6
escv_image_plane_data(gx_image_enum_common_t *info, const gx_image_plane_t *planes, int height, int *rows_used)
#else
@@ -2803,7 +2803,7 @@
}
-private int
+static int
#if GS_VERSION_MAJOR >= 6
escv_image_end_image(gx_image_enum_common_t * info, bool draw_last)
#else
@@ -2841,7 +2841,7 @@
}
-private void escv_write_begin(gx_device *dev, int bits, int x, int y, int sw, int sh, int dw, int dh, int roll)
+static void escv_write_begin(gx_device *dev, int bits, int x, int y, int sw, int sh, int dw, int dh, int roll)
{
gx_device_vector *const vdev = (gx_device_vector *) dev;
gx_device_escv *const pdev = (gx_device_escv *)dev;
@@ -2932,7 +2932,7 @@
}
-private void escv_write_data(gx_device *dev, int bits, char *buf, int bsize, int w, int ras)
+static void escv_write_data(gx_device *dev, int bits, char *buf, int bsize, int w, int ras)
{
gx_device_vector *const vdev = (gx_device_vector *) dev;
gx_device_escv *const pdev = (gx_device_escv *) dev;
@@ -3014,7 +3014,7 @@
}
-private void escv_write_end(gx_device *dev, int bits)
+static void escv_write_end(gx_device *dev, int bits)
{
gx_device_escv *const pdev = (gx_device_escv *) dev;
stream *s = gdev_vector_stream((gx_device_vector *)pdev);
Modified: trunk/gs/contrib/gdevbjc_.c
===================================================================
--- trunk/gs/contrib/gdevbjc_.c 2007-09-24 03:52:18 UTC (rev 8249)
+++ trunk/gs/contrib/gdevbjc_.c 2007-09-25 13:31:24 UTC (rev 8250)
@@ -46,13 +46,13 @@
#include "gdevbjc_.h"
/* ------ The device descriptors ------ */
-private dev_proc_print_page(bjc_print_page);
-private dev_proc_print_page(bjc_print_page_mono);
-private dev_proc_print_page(bjc_print_page_gray);
-private dev_proc_print_page(bjc_print_page_cmyk);
-private dev_proc_print_page(bjc_print_page_color);
-private dev_proc_put_params(gdev_bjc_put_params);
-private dev_proc_get_params(gdev_bjc_get_params);
+static dev_proc_print_page(bjc_print_page);
+static dev_proc_print_page(bjc_print_page_mono);
+static dev_proc_print_page(bjc_print_page_gray);
+static dev_proc_print_page(bjc_print_page_cmyk);
+static dev_proc_print_page(bjc_print_page_color);
+static dev_proc_put_params(gdev_bjc_put_params);
+static dev_proc_get_params(gdev_bjc_get_params);
const stringParamDescription *
paramValueToParam(const stringParamDescription *, int);
const stringParamDescription *
@@ -143,7 +143,7 @@
{ {0} }
};
-private stringParamDescription strMedia[] = {
+static stringParamDescription strMedia[] = {
{{"PlainPaper", 10, false}, 0},
{{"CoatedPaper", 11, false}, 1},
{{"TransparencyFilm", 16, false}, 2},
@@ -213,7 +213,7 @@
/* ------------------------- 1 bit Monochrome ---------------------------- */
/***************************************************************************/
-private const gx_device_procs bjcmono_procs =
+static const gx_device_procs bjcmono_procs =
prn_color_params_procs(gdev_prn_open, gdev_prn_output_page, gdev_prn_close,
NULL, NULL,
gdev_bjc_get_params, gdev_bjc_put_params);
@@ -236,7 +236,7 @@
/* -------------------------- 8 bit Grayscale ---------------------------- */
/***************************************************************************/
-private const gx_device_procs bjcgray_procs =
+static const gx_device_procs bjcgray_procs =
prn_color_params_procs(gdev_prn_open, gdev_prn_output_page, gdev_prn_close,
gx_default_gray_map_rgb_color, gx_default_gray_map_color_rgb,
gdev_bjc_get_params, gdev_bjc_put_params);
@@ -261,7 +261,7 @@
-private const gx_device_procs bjc_cmykcolor_procs =
+static const gx_device_procs bjc_cmykcolor_procs =
bjc_cmyk_param_procs(gdev_prn_open, gdev_prn_output_page, gdev_prn_close,
cmyk_1bit_map_color_rgb, cmyk_1bit_map_cmyk_color,
gdev_bjc_get_params, gdev_bjc_put_params);
@@ -286,7 +286,7 @@
-private const gx_device_procs bjc_truecolor_procs =
+static const gx_device_procs bjc_truecolor_procs =
bjc_cmyk_param_procs(gdev_prn_open, gdev_prn_output_page, gdev_prn_close,
cmyk_8bit_map_color_rgb, cmyk_8bit_map_cmyk_color,
gdev_bjc_get_params, gdev_bjc_put_params);
@@ -310,7 +310,7 @@
/***************************************************************************/
/*
-private int
+static int
bjc_print_page(gx_device_printer * pdev, FILE * file)
{
#define ppdev ((gx_device_bjc_printer *) pdev)
@@ -396,7 +396,7 @@
/* Get parameters. BJC printer devices add several more parameters */
/* to the default set. */
-private int
+static int
gdev_bjc_get_params(gx_device * pdev, gs_param_list * plist)
{
const gx_device_bjc_printer * ppdev = (gx_device_bjc_printer *)pdev;
@@ -435,7 +435,7 @@
}
/* Put parameters. */
-private int
+static int
gdev_bjc_put_params(gx_device * pdev, gs_param_list * plist)
{
int code, ecode = 0;
@@ -567,7 +567,7 @@
#undef ppdev
}
-private int
+static int
bjc_print_page_mono(gx_device_printer * pdev, FILE * file)
{
#define ppdev ((gx_device_bjc_printer *) pdev)
@@ -639,7 +639,7 @@
#undef ppdev
}
-private int
+static int
bjc_print_page_gray(gx_device_printer * pdev, FILE * file)
{
#define ppdev ((gx_device_bjc_printer *) pdev)
@@ -724,7 +724,7 @@
#undef ppdev
}
-private int
+static int
bjc_print_page_cmyk(gx_device_printer * pdev, FILE * file)
{
#define ppdev ((gx_device_bjc_printer *) pdev)
@@ -843,7 +843,7 @@
#undef ppdev
}
-private int
+static int
bjc_print_page_color(gx_device_printer * pdev, FILE * file)
{
#define ppdev ((gx_device_bjc_printer *) pdev)
Modified: trunk/gs/contrib/gdevbjca.c
===================================================================
--- trunk/gs/contrib/gdevbjca.c 2007-09-24 03:52:18 UTC (rev 8249)
+++ trunk/gs/contrib/gdevbjca.c 2007-09-25 13:31:24 UTC (rev 8250)
@@ -46,35 +46,35 @@
#include <math.h>
#include <time.h>
-private void bjc_put_bytes(FILE *file, const char *data, int count);
-private void bjc_put_hi_lo(FILE *file, int value);
-private void bjc_put_lo_hi(FILE *file, int value);
-private void bjc_put_command(FILE *file, char command, int count);
+static void bjc_put_bytes(FILE *file, const char *data, int count);
+static void bjc_put_hi_lo(FILE *file, int value);
+static void bjc_put_lo_hi(FILE *file, int value);
+static void bjc_put_command(FILE *file, char command, int count);
/* ---------------- Utilities ---------------- */
-private void
+static void
bjc_put_bytes(FILE *file, const char *data, int count)
{
fwrite(data, count, 1, file);
}
-private void
+static void
bjc_put_hi_lo(FILE *file, int value)
{
fputc(((value & 0xffff) >> 8), file);
fputc(value & 0xff, file);
}
-private void
+static void
bjc_put_lo_hi(FILE *file, int value)
{
fputc(value & 0xff, file);
fputc(((value & 0xffff) >> 8), file);
}
-private void
+static void
bjc_put_command(FILE *file, char command, int count)
{ char tmp[3] = { '\033', '(', ' '};
tmp[2] = command;
Modified: trunk/gs/contrib/gdevcd8.c
===================================================================
--- trunk/gs/contrib/gdevcd8.c 2007-09-24 03:52:18 UTC (rev 8249)
+++ trunk/gs/contrib/gdevcd8.c 2007-09-25 13:31:24 UTC (rev 8250)
@@ -1,4 +1,3 @@
-/* $Id: gdevcd8.c,v 1.5 2002/07/30 18:53:21 easysw Exp $ */
/*
Copyright (C) 2000 Hewlett-Packard Company
Portions Copyright (C) 1996-1998 <Uli Wortmann uliw at erdw.ethz.ch>.
@@ -29,7 +28,7 @@
copyright notice and this notice be preserved on all copies.
*/
-/* gdevcd8.c */
+/* $Id: gdevcd8.c,v 1.5 2002/07/30 18:53:21 easysw Exp $ */
/*----------------------------------------------------------------
@@ -196,7 +195,7 @@
typedef struct hp850_cmyk_init_s {
byte a[26];
} hp850_cmyk_init_t;
-private const hp850_cmyk_init_t hp850_cmyk_init =
+static const hp850_cmyk_init_t hp850_cmyk_init =
{
{
0x02, /* format */
@@ -244,7 +243,7 @@
int correct[256]; /* potential undercolor black correction */
} Gamma;
-private const Gamma gammat850 =
+static const Gamma gammat850 =
{
/* Lookup values for cyan */
{0, 0, 0, 2, 2, 2, 3, 3, 3, 5, 5, 5, 7, 7, 6, 7, 7, 6, 7, 7, 7, 8, 8,
@@ -316,7 +315,7 @@
};
-private const Gamma gammat890 =
+static const Gamma gammat890 =
{
/* Lookup values for cyan */
{0, 2, 3, 5, 7, 8, 10, 12, 13, 15, 16, 18, 20, 21, 23, 25, 26, 28, 29,
@@ -399,7 +398,7 @@
169, 173, 178, 183, 189, 196, 207, 255},
};
-private const Gamma * const gammat[] =
+static const Gamma * const gammat[] =
{
&gammat850, /* CDJ670 */
&gammat850, /* CDJ850 */
@@ -408,20 +407,20 @@
&gammat850 /* CDJ1600 */
};
-private int
+static int
rescale_byte_wise1x1(int bytecount, const byte * inbytea,
const byte * inbyteb, byte * outbyte);
-private int
+static int
rescale_byte_wise2x1(int bytecount, const byte * inbytea,
const byte * inbyteb, byte * outbyte);
-private int
+static int
rescale_byte_wise1x2(int bytecount, const byte * inbytea,
const byte * inbyteb, byte * outbyte);
-private int
+static int
rescale_byte_wise2x2(int bytecount, const byte * inbytea,
const byte * inbyteb, byte * outbyte);
-private int (* const rescale_color_plane[2][2]) (int, const byte *, const byte *, byte *) = {
+static int (* const rescale_color_plane[2][2]) (int, const byte *, const byte *, byte *) = {
{
rescale_byte_wise1x1, rescale_byte_wise1x2
},
@@ -475,24 +474,24 @@
/*
* Colour mapping procedures
*/
-private dev_proc_map_cmyk_color(gdev_cmyk_map_cmyk_color);
-private dev_proc_map_rgb_color(gdev_cmyk_map_rgb_color);
-private dev_proc_map_color_rgb(gdev_cmyk_map_color_rgb);
+static dev_proc_map_cmyk_color(gdev_cmyk_map_cmyk_color);
+static dev_proc_map_rgb_color(gdev_cmyk_map_rgb_color);
+static dev_proc_map_color_rgb(gdev_cmyk_map_color_rgb);
-private dev_proc_map_rgb_color(gdev_pcl_map_rgb_color);
-private dev_proc_map_color_rgb(gdev_pcl_map_color_rgb);
+static dev_proc_map_rgb_color(gdev_pcl_map_rgb_color);
+static dev_proc_map_color_rgb(gdev_pcl_map_color_rgb);
/*
* Print-page, parameters and miscellaneous procedures
*/
-private dev_proc_open_device(hp_colour_open);
+static dev_proc_open_device(hp_colour_open);
-private dev_proc_get_params(cdj850_get_params);
-private dev_proc_put_params(cdj850_put_params);
+static dev_proc_get_params(cdj850_get_params);
+static dev_proc_put_params(cdj850_put_params);
-private dev_proc_print_page(cdj850_print_page);
-private dev_proc_print_page(chp2200_print_page);
+static dev_proc_print_page(cdj850_print_page);
+static dev_proc_print_page(chp2200_print_page);
/* The device descriptors */
@@ -728,11 +727,11 @@
/* Printer-specific functions. Most printers are handled by the cdj850_xx()
* functions.
*/
-private void
+static void
cdj850_start_raster_mode(gx_device_printer * pdev,
int papersize, FILE * prn_stream);
-private void
+static void
cdj850_print_non_blank_lines(gx_device_printer * pdev,
struct ptr_arrays *data_ptrs,
struct misc_struct *misc_vars,
@@ -740,17 +739,17 @@
const Gamma *gamma,
FILE * prn_stream);
-private void
+static void
cdj850_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
/* The 880C and siblings need a separate set of functions because they seem
* to require a somewhat different version of PCL3+.
*/
-private void
+static void
cdj880_start_raster_mode(gx_device_printer * pdev,
int papersize, FILE * prn_stream);
-private void
+static void
cdj880_print_non_blank_lines(gx_device_printer * pdev,
struct ptr_arrays *data_ptrs,
struct misc_struct *misc_vars,
@@ -758,55 +757,55 @@
const Gamma *gamma,
FILE * prn_stream);
-private void
+static void
cdj880_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
/* Functions for the 1600C.
*/
-private void
+static void
cdj1600_start_raster_mode(gx_device_printer * pdev,
int papersize, FILE * prn_stream);
-private void
+static void
cdj1600_print_non_blank_lines(gx_device_printer * pdev,
struct ptr_arrays *data_ptrs,
struct misc_struct *misc_vars,
struct error_val_field *error_values,
const Gamma *gamma,
FILE * prn_stream);
-private void
+static void
cdj1600_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
/* Functions for the HP2200C */
-private void
+static void
chp2200_start_raster_mode(gx_device_printer * pdev,
int papersize, FILE * prn_stream);
-private void
+static void
chp2200_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
-private const gx_device_procs cdj670_procs =
+static const gx_device_procs cdj670_procs =
cmyk_colour_procs(hp_colour_open, cdj850_get_params, cdj850_put_params,
NULL, gdev_cmyk_map_color_rgb, gdev_cmyk_map_cmyk_color);
-private const gx_device_procs cdj850_procs =
+static const gx_device_procs cdj850_procs =
cmyk_colour_procs(hp_colour_open, cdj850_get_params, cdj850_put_params,
NULL, gdev_cmyk_map_color_rgb, gdev_cmyk_map_cmyk_color);
-private const gx_device_procs cdj880_procs =
+static const gx_device_procs cdj880_procs =
cmyk_colour_procs(hp_colour_open, cdj850_get_params, cdj850_put_params,
NULL, gdev_cmyk_map_color_rgb, gdev_cmyk_map_cmyk_color);
-private const gx_device_procs cdj890_procs =
+static const gx_device_procs cdj890_procs =
cmyk_colour_procs(hp_colour_open, cdj850_get_params, cdj850_put_params,
NULL, gdev_cmyk_map_color_rgb, gdev_cmyk_map_cmyk_color);
-private const gx_device_procs cdj1600_procs =
+static const gx_device_procs cdj1600_procs =
cmyk_colour_procs(hp_colour_open, cdj850_get_params, cdj850_put_params,
gdev_pcl_map_rgb_color, gdev_pcl_map_color_rgb, NULL);
/* HP2200 is a RGB printer */
-private const gx_device_procs chp2200_procs =
+static const gx_device_procs chp2200_procs =
cmyk_colour_procs(hp_colour_open, cdj850_get_params, cdj850_put_params,
gx_default_rgb_map_rgb_color, gx_default_rgb_map_color_rgb, NULL);
@@ -855,12 +854,12 @@
chp2200_terminate_page);
/* Forward references */
-private int cdj_put_param_int(gs_param_list *, gs_param_name,
+static int cdj_put_param_int(gs_param_list *, gs_param_name,
int *, int, int, int);
-private int cdj_put_param_float(gs_param_list *, gs_param_name, float
+static int cdj_put_param_float(gs_param_list *, gs_param_name, float
*, float, float, int);
-private int cdj_put_param_bpp(gx_device *, gs_param_list *, int, int, int);
-private int cdj_set_bpp(gx_device *, int, int);
+static int cdj_put_param_bpp(gx_device *, gs_param_list *, int, int, int);
+static int cdj_set_bpp(gx_device *, int, int);
/* hp_colour_open()
@@ -870,7 +869,7 @@
*
* Inputs: gx_device ptr to the device
*/
-private int
+static int
hp_colour_open(gx_device * pdev)
{ /* Change the margins if necessary. */
static const float dj_a4[4] = {
@@ -1020,7 +1019,7 @@
}
/* Added parameters for DeskJet 850C */
-private int
+static int
cdj850_get_params(gx_device * pdev, gs_param_list * plist)
{
int code = gdev_prn_get_params(pdev, plist);
@@ -1046,7 +1045,7 @@
return code;
}
-private int
+static int
cdj850_put_params(gx_device * pdev, gs_param_list * plist)
{
int quality = cdj850->quality;
@@ -1101,77 +1100,77 @@
#define calc_buffsize(a, b) (((((a) + ((b) * W) - 1) / ((b) * W))) * W)
/* internal functions */
-private void
+static void
FSDlinebw(int scan, int plane_size,
struct error_val_field *error_values,
byte * kP,
int n, int *ep, byte * dp);
-private void
+static void
FSDlinec2(int scan, int plane_size,
struct error_val_field *error_values,
byte * cPa, byte * mPa, byte * yPa, int n,
byte * dp, int *ep);
-private void
+static void
FSDlinec3(int scan, int plane_size,
struct error_val_field *error_values,
byte * cPa, byte * mPa, byte * yPa,
byte * cPb, byte * mPb, byte * yPb,
int n, byte * dp, int *ep);
-private void
+static void
FSDlinec4(int scan, int plane_size,
struct error_val_field *error_values,
byte * cPa, byte * mPa, byte * yPa,
byte * cPb, byte * mPb, byte * yPb,
int n, byte * dp, int *ep);
-private void
+static void
init_error_buffer(struct misc_struct *misc_vars,
struct ptr_arrays *data_ptrs);
-private void
+static void
do_floyd_steinberg(int scan, int cscan, int plane_size,
int plane_size_c, int n,
struct ptr_arrays *data_ptrs,
gx_device_printer * pdev,
struct error_val_field *error_values);
-private int
+static int
do_gcr(int bytecount, byte * inbyte, const byte * kvalues,
const byte * cvalues, const byte * mvalues,
const byte * yvalues, const int *kcorrect,
word * inword);
/* UNUSED
- *private int
+ *static int
*test_scan (P4(int size,
* byte * current,
* byte * last,
* byte * control));
- *private void
+ *static void
*save_color_data(P3(int size,
* byte * current,
* byte * saved));
*
*/
-private void
+static void
send_scan_lines(gx_device_printer * pdev,
struct ptr_arrays *data_ptrs,
struct misc_struct *misc_vars,
struct error_val_field *error_values,
const Gamma *gamma,
FILE * prn_stream);
-private void
+static void
do_gamma(float mastergamma, float gammaval, byte * values);
-private void
+static void
do_black_correction(float kvalue, int *kcorrect);
-private void
+static void
init_data_structure(gx_device_printer * pdev,
struct ptr_arrays *data_ptrs,
struct misc_struct *misc_vars);
-private void
+static void
calculate_memory_size(gx_device_printer * pdev,
struct misc_struct *misc_vars);
-private void
+static void
assign_dpi(int dpi, byte * msb)
{
if (dpi == 600) {
@@ -1183,7 +1182,7 @@
}
}
-private void
+static void
cdj850_terminate_page(gx_device_printer * pdev, FILE * prn_stream)
{
fputs("0M", prn_stream); /* Reset compression */
@@ -1191,7 +1190,7 @@
fputs("\033&l0H", prn_stream); /* eject page */
}
-private void
+static void
cdj880_terminate_page(gx_device_printer * pdev, FILE * prn_stream)
{
fputs("\033*rC\f\033E", prn_stream); /* End graphics, FF, Reset */
@@ -1199,7 +1198,7 @@
}
/* HP2200 terminate page routine */
-private void
+static void
chp2200_terminate_page(gx_device_printer * pdev, FILE * prn_stream)
{
fputs("\033*rC\f\033E", prn_stream); /* End graphics, FF, Reset */
@@ -1207,7 +1206,7 @@
}
/* Here comes the hp850 output routine -------------------- */
-private int
+static int
cdj850_print_page(gx_device_printer * pdev, FILE * prn_stream)
{
@@ -1312,7 +1311,7 @@
eCachedColor = 0x3
};
-private inline unsigned int
+static inline unsigned int
getPixel(byte* pixAddress, unsigned int pixelOffset)
{
pixAddress += (pixelOffset*3); /* assume 3 bytes for each RGB pixel */
@@ -1329,7 +1328,7 @@
*/
}
-private inline void
+static inline void
putPixel(byte* pixAddress, unsigned int pixelOffset, unsigned int pixel)
{
pixAddress += (pixelOffset*3); /* assume 3 bytes for each RGB pixel*/
@@ -1346,7 +1345,7 @@
*/
}
-private inline unsigned int
+static inline unsigned int
ShortDelta(byte* curPtr, byte* seedPtr, unsigned int pixelOffset)
{
int dr, dg, db;
@@ -1372,7 +1371,7 @@
}
/* HP2200C - mode 10 compression for RGB data */
-private unsigned int
+static unsigned int
Mode10(unsigned int planeWidthInPixels,
byte * pbyColorScanPtr, /*input scanline in RGBRGBRGB format*/
byte * pbyColorSeedPtr,
@@ -1669,7 +1668,7 @@
Since white is 0xFFFFFF (24 bits), there must be non-white pixels if
there is a byte which is not 0xFF
*/
-private int
+static int
IsScanlineDirty(byte* pScanline, int iWidth)
{
byte * pCurr = pScanline;
@@ -1690,7 +1689,7 @@
#define INIT_WHITE(pBuf, uiWidth) memset((void*)(pBuf), 0xFF, (uiWidth))
/* HP2200 output routine -------------------- */
-private int
+static int
chp2200_print_page(gx_device_printer * pdev, FILE * prn_stream)
{
gs_memory_t *mem = pdev->memory;
@@ -1785,7 +1784,7 @@
#define odd(i) ((i & 01) != 0)
-private int
+static int
GetScanLine(gx_device_printer * pdev, int *lnum,
struct ptr_arrays *data_ptrs,
struct misc_struct *misc_vars,
@@ -1811,7 +1810,7 @@
}
/* Send the scan lines to the printer */
-private void
+static void
send_scan_lines(gx_device_printer * pdev,
struct ptr_arrays *data_ptrs,
struct misc_struct *misc_vars,
@@ -1875,7 +1874,7 @@
}
/* print_line compresses (mode 9) and outputs one plane */
-private void
+static void
print_c9plane(FILE * prn_stream, char plane_code, int plane_size,
const byte * curr, const byte * prev, byte * out_data)
{
@@ -1895,7 +1894,7 @@
* Compresses a single plane with mode 2 (TIFF 4 format) and sends the
* result to the output.
*/
-private void
+static void
print_c2plane(FILE *prn_stream, char plane_code, int plane_size,
const byte *curr, byte *out_data)
{
@@ -1918,7 +1917,7 @@
*
* Outputs a plane with no compression.
*/
-private void
+static void
print_c0plane(FILE *prn_stream, char plane_code, int plane_size,
const byte *curr, byte *out_data)
{
@@ -1929,7 +1928,7 @@
/* Printing non-blank lines */
-private void
+static void
cdj850_print_non_blank_lines(gx_device_printer * pdev,
struct ptr_arrays *data_ptrs,
struct misc_struct *misc_vars,
@@ -2007,7 +2006,7 @@
}
/* Printing non-blank lines */
-private void
+static void
cdj880_print_non_blank_lines(gx_device_printer * pdev,
struct ptr_arrays *data_ptrs,
struct misc_struct *misc_vars,
@@ -2090,7 +2089,7 @@
/* moved that code into his own subroutine, otherwise things get
somewhat clumsy */
-private void
+static void
do_floyd_steinberg(int scan, int cscan, int plane_size,
int plane_size_c, int n,
struct ptr_arrays *data_ptrs,
@@ -2142,7 +2141,7 @@
}
/* here we do our own gamma-correction */
-private void
+static void
do_gamma(float mastergamma, float gammaval, byte values[256])
{
int i;
@@ -2165,7 +2164,7 @@
/* here we calculate a lookup-table which is used to compensate the
relative loss of color due to undercolor-removal */
-private void
+static void
do_black_correction(float kvalue, int kcorrect[256])
{
int i;
@@ -2239,7 +2238,7 @@
/* Since resolution can be different on different planes, we need to
do real color separation, here we try a real grey component
replacement */
-private int
+static int
do_gcr(int bytecount, byte * inbyte, const byte kvalues[256],
const byte cvalues[256], const byte mvalues[256],
const byte yvalues[256], const int kcorrect[256],
@@ -2340,7 +2339,7 @@
/* Since resolution can be different on different planes, we need to
rescale the data byte by byte */
-private int
+static int
rescale_byte_wise2x2(int bytecount, const byte * inbytea, const byte * inbyteb,
byte * outbyte)
{
@@ -2364,7 +2363,7 @@
/* Since resolution can be different on different planes, we need to
rescale the data byte by byte */
-private int
+static int
rescale_byte_wise2x1(int bytecount, const byte * inbytea, const byte * inbyteb,
byte * outbyte)
{
@@ -2385,7 +2384,7 @@
/* Since resolution can be different on different planes, we need to
rescale the data byte by byte */
-private int
+static int
rescale_byte_wise1x2(int bytecount, const byte * inbytea, const byte * inbyteb,
byte * outbyte)
{
@@ -2404,7 +2403,7 @@
/* Since resolution can be different on different planes, we need to
rescale the data byte by byte */
-private int
+static int
rescale_byte_wise1x1(int bytecount, const byte * inbytea, const byte * inbyteb,
byte * outbyte)
{
@@ -2485,7 +2484,7 @@
/* --------------------------- */
/* initialise the error_buffer */
-private void
+static void
init_error_buffer(struct misc_struct * misc_vars,
struct ptr_arrays * data_ptrs)
{
@@ -2548,7 +2547,7 @@
*
* Returns: Nothing.
*/
-private void
+static void
FSDlinebw(int scan, int plane_size,
struct error_val_field * error_values,
byte * kP, int n, int * ep, byte * dp)
@@ -2600,7 +2599,7 @@
/* Since bw has already been dithered for the hp850c, we need
an adapted dither algorythm */
-private void
+static void
FSDlinec2(int scan, int plane_size,
struct error_val_field *error_values,
byte * cPa, byte * mPa, byte * yPa, int n,
@@ -2665,7 +2664,7 @@
}
/* On ordinary paper, we'll only use 3 intensities with the hp850 */
-private void
+static void
FSDlinec3(int scan, int plane_size,
struct error_val_field *error_values,
byte * cPa, byte * mPa, byte * yPa,
@@ -2749,7 +2748,7 @@
/* The hp850c knows about 4 intensity levels per color. Once more, we need
an adapted dither algorythm */
-private void
+static void
FSDlinec4(int scan, int plane_size,
struct error_val_field *error_values,
byte * cPa, byte * mPa, byte * yPa,
@@ -2808,7 +2807,7 @@
/* calculate the needed memory */
-private void
+static void
calculate_memory_size(gx_device_printer * pdev,
struct misc_struct *misc_vars)
{
@@ -2870,7 +2869,7 @@
/* Initialise the needed pointers */
-private void
+static void
init_data_structure(gx_device_printer * pdev,
struct ptr_arrays *data_ptrs,
struct misc_struct *misc_vars)
@@ -2958,7 +2957,7 @@
} /* end init_data_structure */
/* Configure the printer and start Raster mode */
-private void
+static void
cdj850_start_raster_mode(gx_device_printer * pdev, int paper_size,
FILE * prn_stream)
{
@@ -3017,7 +3016,7 @@
} /* end configure raster-mode */
/* Configure the printer and start Raster mode */
-private void
+static void
cdj880_start_raster_mode(gx_device_printer * pdev, int paper_size,
FILE * prn_stream)
{
@@ -3089,7 +3088,7 @@
#define LOBYTE(w) ((byte)(w))
/* Start Raster mode for HP2200 */
-private void
+static void
chp2200_start_raster_mode(gx_device_printer * pdev, int paper_size,
FILE * prn_stream)
{
@@ -3154,7 +3153,7 @@
return;
} /* end configure raster-mode */
-private int near
+static int near
cdj_put_param_int(gs_param_list * plist, gs_param_name pname, int *pvalue,
int minval, int maxval, int ecode)
{
@@ -3173,7 +3172,7 @@
}
}
-private int near
+static int near
cdj_put_param_float(gs_param_list * plist, gs_param_name pname, float *pvalue,
float minval, float maxval, int ecode)
{
@@ -3193,7 +3192,7 @@
}
}
-private int
+static int
cdj_set_bpp(gx_device * pdev, int bpp, int ccomps)
{
gx_device_color_info *ci = &pdev->color_info;
@@ -3395,7 +3394,7 @@
(m) = gx_bits_to_color_value(((v) >> (b)) & ((1 << (b)) - 1), (b)), \
(y) = gx_bits_to_color_value((v) & ((1 << (b)) - 1), (b))
-private gx_color_index
+static gx_color_index
gdev_cmyk_map_cmyk_color(gx_device * pdev,
const gx_color_value cv[])
{
@@ -3434,7 +3433,7 @@
/* Mapping of RGB colors to gray values. */
-private gx_color_index
+static gx_color_index
gdev_cmyk_map_rgb_color(gx_device * pdev, const gx_color_value cv[])
{
gx_color_value r, g, b;
@@ -3468,7 +3467,7 @@
}
/* Mapping of CMYK colors. */
-private int
+static int
gdev_cmyk_map_color_rgb(gx_device * pdev, gx_color_index color,
gx_color_value prgb[3])
{
@@ -3526,7 +3525,7 @@
return 0;
}
-private gx_color_index
+static gx_color_index
gdev_pcl_map_rgb_color(gx_device * pdev, const gx_color_value cv[])
{
gx_color_value r, g, b;
@@ -3581,7 +3580,7 @@
}
/* Map a color index to a r-g-b color. */
-private int
+static int
gdev_pcl_map_color_rgb(gx_device * pdev, gx_color_index color,
gx_color_value prgb[3])
{
@@ -3646,7 +3645,7 @@
If new_bpp != 0, it must be the value of the BitsPerPixel element of
the plist; real_bpp may differ from new_bpp.
*/
-private int
+static int
cdj_put_param_bpp(gx_device * pdev, gs_param_list * plist, int new_bpp,
int real_bpp, int ccomps)
{
@@ -3686,7 +3685,7 @@
/* the following code was in the original driver but is unused
- * private int
+ * static int
* x_mul_div (int a, int b, int c)
* {
* int result;
@@ -3695,7 +3694,7 @@
* return result;
* }
*
- * private void
+ * static void
* save_color_data(int size,
* byte * current,
* byte * saved)
@@ -3707,7 +3706,7 @@
* return;
* }
*
- * private int
+ * static int
* test_scan (int size,
* byte * current,
* byte * last,
@@ -3730,7 +3729,7 @@
* }
*
* * Transform from cmy into hsv
- * private void
+ * static void
* cmy2hsv(int *c, int *m, int *y, int *h, int *s, int *v)
* {
* int hue;
@@ -3783,7 +3782,7 @@
/************************ the routines for the cdj1600 printer ***************/
/* Configure the printer and start Raster mode */
-private void
+static void
cdj1600_start_raster_mode(gx_device_printer * pdev, int paper_size,
FILE * prn_stream)
{
@@ -3834,7 +3833,7 @@
} /* end configure raster-mode */
/* print_plane compresses (mode 3) and outputs one plane */
-private void
+static void
print_c3plane(FILE * prn_stream, char plane_code, int plane_size,
const byte * curr, byte * prev, byte * out_data)
{
@@ -3850,7 +3849,7 @@
}
}
-private int
+static int
copy_color_data(byte * dest, const byte * src, int n)
{
/* copy word by word */
@@ -3865,7 +3864,7 @@
}
/* Printing non-blank lines */
-private void
+static void
cdj1600_print_non_blank_lines(gx_device_printer * pdev,
struct ptr_arrays *data_ptrs,
struct misc_struct *misc_vars,
@@ -3899,7 +3898,7 @@
misc_vars->cscan = 1 - misc_vars->cscan;
}
-private void
+static void
cdj1600_terminate_page(gx_device_printer * pdev, FILE * prn_stream)
{
cdj850_terminate_page(pdev, prn_stream);
Modified: trunk/gs/contrib/gdevdj9.c
===================================================================
--- trunk/gs/contrib/gdevdj9.c 2007-09-24 03:52:18 UTC (rev 8249)
+++ trunk/gs/contrib/gdevdj9.c 2007-09-25 13:31:24 UTC (rev 8250)
@@ -118,7 +118,7 @@
typedef struct hp970_cmyk_init_s {
byte a[26];
} hp970_cmyk_init_t;
-private const hp970_cmyk_init_t hp970_cmyk_init =
+static const hp970_cmyk_init_t hp970_cmyk_init =
{
{
0x02, /* format */
@@ -166,7 +166,7 @@
int correct[256]; /* potential undercolor black correction */
} Gamma;
-private const Gamma gammat970 =
+static const Gamma gammat970 =
{
/* Lookup values for cyan */
{0, 0, 0, 2, 2, 2, 3, 3, 3, 5, 5, 5, 7, 7, 6, 7, 7, 6, 7, 7, 7, 8, 8,
@@ -237,25 +237,25 @@
166, 169, 174, 177, 182, 187, 194, 203, 215, 255}
};
-private const Gamma * const gammat[] =
+static const Gamma * const gammat[] =
{
&gammat970, /* CDJ970Cxi */
};
-private int
+static int
rescale_byte_wise1x1(int bytecount, const byte * inbytea,
const byte * inbyteb, byte * outbyte);
-private int
+static int
rescale_byte_wise2x1(int bytecount, const byte * inbytea,
const byte * inbyteb, byte * outbyte);
-private int
+static int
rescale_byte_wise1x2(int bytecount, const byte * inbytea,
const byte * inbyteb, byte * outbyte);
-private int
+static int
rescale_byte_wise2x2(int bytecount, const byte * inbytea,
const byte * inbyteb, byte * outbyte);
-private int (* const rescale_color_plane[2][2]) (int, const byte *, const byte *, byte *) = {
+static int (* const rescale_color_plane[2][2]) (int, const byte *, const byte *, byte *) = {
{
rescale_byte_wise1x1, rescale_byte_wise1x2
},
@@ -264,7 +264,7 @@
}
};
/*
-private int (* const rescale_color_plane[2][2]) (int, const byte *, const byte *, byte *) = {
+static int (* const rescale_color_plane[2][2]) (int, const byte *, const byte *, byte *) = {
{
rescale_byte_wise1x1, rescale_byte_wise1x1
},
@@ -273,8 +273,8 @@
}
};
*/
-private int cdj970_write_header(gx_device *, FILE *);
-private int cdj970_write_trailer(gx_device *, FILE *);
+static int cdj970_write_header(gx_device *, FILE *);
+static int cdj970_write_trailer(gx_device *, FILE *);
/*
* Drivers stuff.
@@ -326,21 +326,21 @@
#define HEAD_ROWS_COLOUR 16
/* Colour mapping procedures */
-private dev_proc_map_cmyk_color(gdev_cmyk_map_cmyk_color);
-private dev_proc_map_rgb_color(gdev_cmyk_map_rgb_color);
-private dev_proc_map_color_rgb(gdev_cmyk_map_color_rgb);
+static dev_proc_map_cmyk_color(gdev_cmyk_map_cmyk_color);
+static dev_proc_map_rgb_color(gdev_cmyk_map_rgb_color);
+static dev_proc_map_color_rgb(gdev_cmyk_map_color_rgb);
-private dev_proc_map_rgb_color(gdev_pcl_map_rgb_color);
-private dev_proc_map_color_rgb(gdev_pcl_map_color_rgb);
+static dev_proc_map_rgb_color(gdev_pcl_map_rgb_color);
+static dev_proc_map_color_rgb(gdev_pcl_map_color_rgb);
/* Print-page, parameters and miscellaneous procedures */
-private dev_proc_open_device(hp_colour_open);
-private dev_proc_close_device(cdj970_close);
+static dev_proc_open_device(hp_colour_open);
+static dev_proc_close_device(cdj970_close);
-private dev_proc_get_params(cdj970_get_params);
-private dev_proc_put_params(cdj970_put_params);
+static dev_proc_get_params(cdj970_get_params);
+static dev_proc_put_params(cdj970_put_params);
-private dev_proc_print_page(cdj970_print_page);
+static dev_proc_print_page(cdj970_print_page);
/* The device descriptors */
@@ -528,22 +528,22 @@
map_cmyk_color\
}
-private void
+static void
cdj970_start_raster_mode(gx_device_printer * pdev,
int papersize, FILE * prn_stream);
-private void
+static void
cdj970_print_non_blank_lines(gx_device_printer * pdev,
struct ptr_arrays *data_ptrs,
struct misc_struct *misc_vars,
struct error_val_field *error_values,
const Gamma *gamma,
FILE * prn_stream);
-private void
+static void
cdj970_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
-private const gx_device_procs cdj970_procs =
+static const gx_device_procs cdj970_procs =
cmyk_colour_procs(hp_colour_open, cdj970_get_params, cdj970_put_params,
cdj970_close, NULL, gdev_cmyk_map_color_rgb, gdev_cmyk_map_cmyk_color);
@@ -555,12 +555,12 @@
cdj970_terminate_page);
/* Forward references */
-private int cdj_put_param_int(gs_param_list *, gs_param_name,
+static int cdj_put_param_int(gs_param_list *, gs_param_name,
int *, int, int, int);
-private int cdj_put_param_float(gs_param_list *, gs_param_name, float
+static int cdj_put_param_float(gs_param_list *, gs_param_name, float
*, float, float, int);
-private int cdj_put_param_bpp(gx_device *, gs_param_list *, int, int, int);
-private int cdj_set_bpp(gx_device *, int, int);
+static int cdj_put_param_bpp(gx_device *, gs_param_list *, int, int, int);
+static int cdj_set_bpp(gx_device *, int, int);
static int PageCtr = 0;
@@ -572,7 +572,7 @@
/* hp_colour_open: Open the printer and set up the margins.
----------------------------------------------------------------------------------*/
-private int hp_colour_open(gx_device * pdev)
+static int hp_colour_open(gx_device * pdev)
{
int retCode;
@@ -599,7 +599,7 @@
/* cdj970_get_params: Added parameters for DeskJet 970C
----------------------------------------------------------------------------------*/
-private int cdj970_get_params(gx_device * pdev, gs_param_list * plist)
+static int cdj970_get_params(gx_device * pdev, gs_param_list * plist)
{
int code = gdev_prn_get_params(pdev, plist);
@@ -626,7 +626,7 @@
/* cdj970_put_params:
----------------------------------------------------------------------------------*/
-private int cdj970_put_params(gx_device * pdev, gs_param_list * plist)
+static int cdj970_put_params(gx_device * pdev, gs_param_list * plist)
{
int quality = cdj970->quality;
int papertype = cdj970->papertype;
@@ -691,37 +691,37 @@
#define calc_buffsize(a, b) (((((a) + ((b) * W) - 1) / ((b) * W))) * W)
/* internal functions */
-private void
+static void
FSDlinebw(int scan, int plane_size,
struct error_val_field *error_values,
byte * kP,
int n, int *ep, byte * dp);
-private void
+static void
FSDlinec2(int scan, int plane_size,
struct error_val_field *error_values,
byte * cPa, byte * mPa, byte * yPa, int n,
byte * dp, int *ep);
-private void
+static void
FSDlinec3(int scan, int plane_size,
struct error_val_field *error_values,
byte * cPa, byte * mPa, byte * yPa,
byte * cPb, byte * mPb, byte * yPb,
int n, byte * dp, int *ep);
-private void
+static void
FSDlinec4(int scan, int plane_size,
struct error_val_field *error_values,
byte * cPa, byte * mPa, byte * yPa,
byte * cPb, byte * mPb, byte * yPb,
int n, byte * dp, int *ep);
-private void
+static void
init_error_buffer(struct misc_struct *misc_vars,
struct ptr_arrays *data_ptrs);
-private void
+static void
do_floyd_steinberg(int scan, int cscan, int plane_size,
int plane_size_c, int n,
struct ptr_arrays *data_ptrs,
@@ -729,12 +729,12 @@
struct error_val_field *error_values);
-private int
+static int
do_gcr(int bytecount, byte * inbyte, const byte * kvalues,
const byte * cvalues, const byte * mvalues,
const byte * yvalues, const int *kcorrect);
-private void
+static void
send_scan_lines(gx_device_printer * pdev,
struct ptr_arrays *data_ptrs,
struct misc_struct *misc_vars,
@@ -742,25 +742,25 @@
const Gamma *gamma,
FILE * prn_stream);
-private void
+static void
do_gamma(float mastergamma, float gammaval, byte * values);
-private void
+static void
do_black_correction(float kvalue, int *kcorrect);
-private void
+static void
init_data_structure(gx_device_printer * pdev,
struct ptr_arrays *data_ptrs,
struct misc_struct *misc_vars);
-private void
+static void
calculate_memory_size(gx_device_printer * pdev,
struct misc_struct *misc_vars);
/* assign_dpi:
----------------------------------------------------------------------------------*/
-private void assign_dpi(int dpi, byte * msb)
+static void assign_dpi(int dpi, byte * msb)
{
if (dpi == 600) {
msb[0] = 0x02;
@@ -773,14 +773,14 @@
/* cdj970_terminate_page:
----------------------------------------------------------------------------------*/
-private void cdj970_terminate_page(gx_device_printer * pdev, FILE * prn_stream)
+static void cdj970_terminate_page(gx_device_printer * pdev, FILE * prn_stream)
{
fputs("\033*rC\f\033&l-2H", prn_stream); /* End Graphics, Reset */
}
/* cdj970_one_time_initialisation:
----------------------------------------------------------------------------------*/
-private void cdj970_one_time_initialisation(gx_device_printer * pdev)
+static void cdj970_one_time_initialisation(gx_device_printer * pdev)
{
/* Change the margins if necessary. */
static const float dj_a4[4] = {
@@ -819,7 +819,7 @@
/* cdj970_print_page: Here comes the hp970 output routine
----------------------------------------------------------------------------------*/
-private int cdj970_print_page(gx_device_printer * pdev, FILE * prn_stream)
+static int cdj970_print_page(gx_device_printer * pdev, FILE * prn_stream)
{
struct error_val_field error_values;
struct ptr_arrays data_ptrs;
@@ -897,7 +897,7 @@
/* GetScanLine:
----------------------------------------------------------------------------------*/
-private int GetScanLine( gx_device_printer * pdev,
+static int GetScanLine( gx_device_printer * pdev,
int *lnum,
struct ptr_arrays *data_ptrs,
struct misc_struct *misc_vars,
@@ -956,7 +956,7 @@
/* send_scan_lines: Send the scan lines to the printer
----------------------------------------------------------------------------------*/
-private void send_scan_lines( gx_device_printer *pdev,
+static void send_scan_lines( gx_device_printer *pdev,
struct ptr_arrays *data_ptrs,
struct misc_struct *misc_vars,
struct error_val_field *error_values,
@@ -1032,7 +1032,7 @@
/* print_c2plane: Sprint_line compresses (mode 2) and outputs one plane
----------------------------------------------------------------------------------*/
-private void print_c2plane( FILE *prn_stream,
+static void print_c2plane( FILE *prn_stream,
char plane_code,
int plane_size,
const byte *curr,
@@ -1058,7 +1058,7 @@
/* cdj970_print_non_blank_lines: Printing non-blank lines
----------------------------------------------------------------------------------*/
-private void cdj970_print_non_blank_lines( gx_device_printer *pdev,
+static void cdj970_print_non_blank_lines( gx_device_printer *pdev,
struct ptr_arrays *data_ptrs,
struct misc_struct *misc_vars,
struct error_val_field *error_values,
@@ -1137,7 +1137,7 @@
/* do_floyd_steinberg: moved that code into his own subroutine,
* otherwise things get somewhat clumsy
----------------------------------------------------------------------------------*/
-private void do_floyd_steinberg( int scan,
+static void do_floyd_steinberg( int scan,
int cscan,
int plane_size,
int plane_size_c,
@@ -1200,7 +1200,7 @@
/* do_gamma: here we do our own gamma-correction
----------------------------------------------------------------------------------*/
-private void do_gamma(float mastergamma, float gammaval, byte values[256])
+static void do_gamma(float mastergamma, float gammaval, byte values[256])
{
int i;
float gamma;
@@ -1224,7 +1224,7 @@
* compensate the relativ loss of color due to
* undercolor-removal
----------------------------------------------------------------------------------*/
-private void do_black_correction(float kvalue, int kcorrect[256])
+static void do_black_correction(float kvalue, int kcorrect[256])
{
int i;
@@ -1284,7 +1284,7 @@
* do real color separation, here we try a real grey component
* replacement
----------------------------------------------------------------------------------*/
-private int do_gcr( int bytecount,
+static int do_gcr( int bytecount,
byte *inbyte,
const byte kvalues[256],
const byte cvalues[256],
@@ -1336,7 +1336,7 @@
/* rescale_byte_wise2x2: Since resolution can be different on different planes,
* we need to rescale the data byte by byte
----------------------------------------------------------------------------------*/
-private int rescale_byte_wise2x2( int bytecount,
+static int rescale_byte_wise2x2( int bytecount,
const byte *inbytea,
const byte *inbyteb,
byte *outbyte)
@@ -1363,7 +1363,7 @@
/* rescale_byte_wise2x1: Since resolution can be different on different planes,
* we need to rescale the data byte by byte
----------------------------------------------------------------------------------*/
-private int rescale_byte_wise2x1( int bytecount,
+static int rescale_byte_wise2x1( int bytecount,
const byte *inbytea,
const byte *inbyteb,
byte *outbyte)
@@ -1390,7 +1390,7 @@
/* rescale_byte_wise1x2: Since resolution can be different on different planes,
* we need to rescale the data byte by byte
----------------------------------------------------------------------------------*/
-private int rescale_byte_wise1x2( int bytecount,
+static int rescale_byte_wise1x2( int bytecount,
const byte *inbytea,
const byte *inbyteb,
byte *outbyte)
@@ -1414,7 +1414,7 @@
/* rescale_byte_wise1x1: Since resolution can be different on different planes,
* we need to rescale the data byte by byte
----------------------------------------------------------------------------------*/
-private int rescale_byte_wise1x1( int bytecount,
+static int rescale_byte_wise1x1( int bytecount,
const byte *inbytea,
const byte *inbyteb,
byte *outbyte)
@@ -1470,7 +1470,7 @@
/* init_error_buffer: initialise the error_buffer
----------------------------------------------------------------------------------*/
-private void init_error_buffer( struct misc_struct *misc_vars,
+static void init_error_buffer( struct misc_struct *misc_vars,
struct ptr_arrays *data_ptrs)
{
int i;
@@ -1514,7 +1514,7 @@
/* FSDlinebw: The hp970 has 600dpi black and 300 dpi color.
----------------------------------------------------------------------------------*/
-private void FSDlinebw( int scan,
+static void FSDlinebw( int scan,
int plane_size,
struct error_val_field *error_values,
byte *kP,
@@ -1573,7 +1573,7 @@
/* FSDlinec2: Since bw has already been dithered for the hp970c, we need
* an adapted dither algorythm
----------------------------------------------------------------------------------*/
-private void FSDlinec2( int scan,
+static void FSDlinec2( int scan,
int plane_size,
struct error_val_field *error_values,
byte *cPa,
@@ -1650,7 +1650,7 @@
/* FSDlinec3: On ordinary paper, we'll only use 3 intensities with the hp970
----------------------------------------------------------------------------------*/
-private void FSDlinec3( int scan,
+static void FSDlinec3( int scan,
int plane_size,
struct error_val_field *error_values,
byte *cPa,
@@ -1742,7 +1742,7 @@
/* FSDlinec4: The hp970c knows about 4 intensity levels per color. Once more,
* we need an adapted dither algorythm
----------------------------------------------------------------------------------*/
-private void FSDlinec4( int scan,
+static void FSDlinec4( int scan,
int plane_size,
struct error_val_field *error_values,
byte *cPa,
@@ -1806,7 +1806,7 @@
/* calculate_memory_size: calculate the needed memory
----------------------------------------------------------------------------------*/
-private void calculate_memory_size( gx_device_printer *pdev,
+static void calculate_memory_size( gx_device_printer *pdev,
struct misc_struct *misc_vars)
{
int xfac = cdj970->xscal ? 2 : 1;
@@ -1866,7 +1866,7 @@
/* init_data_structure: Initialise the needed pointers
----------------------------------------------------------------------------------*/
-private void init_data_structure( gx_device_printer *pdev,
+static void init_data_structure( gx_device_printer *pdev,
struct ptr_arrays *data_ptrs,
struct misc_struct *misc_vars)
{
@@ -1962,7 +1962,7 @@
/* cdj970_start_raster_mode: Configure the printer and start Raster mode
----------------------------------------------------------------------------------*/
-private void cdj970_start_raster_mode( gx_device_printer *pdev,
+static void cdj970_start_raster_mode( gx_device_printer *pdev,
int paper_size,
FILE *prn_stream)
{
@@ -2031,7 +2031,7 @@
/* cdj_put_param_int:
----------------------------------------------------------------------------------*/
-private int cdj_put_param_int( gs_param_list *plist,
+static int cdj_put_param_int( gs_param_list *plist,
gs_param_name pname,
int *pvalue,
int minval,
@@ -2057,7 +2057,7 @@
/* cdj_put_param_float:
----------------------------------------------------------------------------------*/
-private int cdj_put_param_float( gs_param_list *plist,
+static int cdj_put_param_float( gs_param_list *plist,
gs_param_name pname,
float *pvalue,
float minval,
@@ -2084,7 +2084,7 @@
/* cdj_set_bpp:
----------------------------------------------------------------------------------*/
-private int cdj_set_bpp(gx_device * pdev, int bpp, int ccomps)
+static int cdj_set_bpp(gx_device * pdev, int bpp, int ccomps)
{
gx_device_color_info *ci = &pdev->color_info;
@@ -2291,7 +2291,7 @@
/* gdev_cmyk_map_cmyk_color:
----------------------------------------------------------------------------------*/
-private gx_color_index gdev_cmyk_map_cmyk_color(gx_device * pdev,
+static gx_color_index gdev_cmyk_map_cmyk_color(gx_device * pdev,
const gx_color_value cv[])
{
gx_color_index color;
@@ -2329,7 +2329,7 @@
/* gdev_cmyk_map_rgb_color: Mapping of RGB colors to gray values.
----------------------------------------------------------------------------------*/
-private gx_color_index gdev_cmyk_map_rgb_color( gx_device * pdev,
+static gx_color_index gdev_cmyk_map_rgb_color( gx_device * pdev,
const gx_color_value cv[])
{
gx_color_value r, g, b;
@@ -2364,7 +2364,7 @@
/* gdev_cmyk_map_rgb_color: Mapping of CMYK colors.
----------------------------------------------------------------------------------*/
-private int gdev_cmyk_map_color_rgb( gx_device *pdev,
+static int gdev_cmyk_map_color_rgb( gx_device *pdev,
gx_color_index color,
gx_color_value prgb[3])
{
@@ -2426,7 +2426,7 @@
/* gdev_pcl_map_rgb_color:
----------------------------------------------------------------------------------*/
-private gx_color_index gdev_pcl_map_rgb_color( gx_device * pdev,
+static gx_color_index gdev_pcl_map_rgb_color( gx_device * pdev,
const gx_color_value cv[])
{
gx_color_value r, g, b;
@@ -2476,7 +2476,7 @@
/* gdev_pcl_map_color_rgb: Map a color index to a r-g-b color.
----------------------------------------------------------------------------------*/
-private int gdev_pcl_map_color_rgb( gx_device *pdev,
+static int gdev_pcl_map_color_rgb( gx_device *pdev,
gx_color_index color,
gx_color_value prgb[3])
{
@@ -2543,7 +2543,7 @@
* If new_bpp != 0, it must be the value of the BitsPerPixel element of
* the plist; real_bpp may differ from new_bpp.
----------------------------------------------------------------------------------*/
-private int cdj_put_param_bpp( gx_device *pdev,
+static int cdj_put_param_bpp( gx_device *pdev,
gs_param_list *plist,
int new_bpp,
int real_bpp,
@@ -2593,7 +2593,7 @@
/* cdj970_write_header:
----------------------------------------------------------------------------------*/
-private int cdj970_write_header (gx_device *pdev, FILE * prn_stream)
+static int cdj970_write_header (gx_device *pdev, FILE * prn_stream)
{
char startbuffer[1260];
@@ -2630,7 +2630,7 @@
/* cdj970_write_trailer:
----------------------------------------------------------------------------------*/
-private int cdj970_write_trailer (gx_device *pdev, FILE * prn_stream)
+static int cdj970_write_trailer (gx_device *pdev, FILE * prn_stream)
{
fprintf(prn_stream, "\033E\033%%-12345X"); /* reverse engineering */
@@ -2640,7 +2640,7 @@
/* cdj970_close:
----------------------------------------------------------------------------------*/
-private int cdj970_close(gx_device *pdev)
+static int cdj970_close(gx_device *pdev)
{
gx_device_printer *const ppdev = (gx_device_printer *)pdev;
int retCode = gdev_prn_open_printer (pdev, true);
Modified: trunk/gs/contrib/gdevgdi.c
===================================================================
--- trunk/gs/contrib/gdevgdi.c 2007-09-24 03:52:18 UTC (rev 8249)
+++ trunk/gs/contrib/gdevgdi.c 2007-09-25 13:31:24 UTC (rev 8250)
@@ -86,16 +86,16 @@
int GDI_BAND_WIDTH[] = {4768, 4928};
-private int gdi_print_page(gx_device_printer *pdev, FILE *prn_stream);
-private int gdi_open(gx_device *pdev);
-private int gdi_close(gx_device *pdev);
+static int gdi_print_page(gx_device_printer *pdev, FILE *prn_stream);
+static int gdi_open(gx_device *pdev);
+static int gdi_close(gx_device *pdev);
/* The device descriptors */
-private dev_proc_open_device(gdi_open);
-private dev_proc_close_device(gdi_close);
-private dev_proc_print_page(gdi_print_page);
+static dev_proc_open_device(gdi_open);
+static dev_proc_close_device(gdi_close);
+static dev_proc_print_page(gdi_print_page);
-private gx_device_procs prn_gdi_procs =
+static gx_device_procs prn_gdi_procs =
prn_params_procs(gdi_open, gdev_prn_output_page, gdi_close,
gdev_prn_get_params, gdev_prn_put_params);
@@ -115,23 +115,23 @@
1, /* color bit */
gdi_print_page);
-private FILE *WritePJLHeaderData(gx_device_printer *pdev, FILE *fp);
-private FILE *WriteBandHeader(FILE *fp, unsigned int usBandNo,
+static FILE *WritePJLHeaderData(gx_device_printer *pdev, FILE *fp);
+static FILE *WriteBandHeader(FILE *fp, unsigned int usBandNo,
unsigned char ubCompMode, unsigned int usBandWidth,
unsigned int usBandHeight, unsigned long ulBandSize);
-private FILE *WriteTrailerData(FILE *fp);
-private unsigned long FrameTiffComp(unsigned char *pubDest, unsigned char *pubSrc,
+static FILE *WriteTrailerData(FILE *fp);
+static unsigned long FrameTiffComp(unsigned char *pubDest, unsigned char *pubSrc,
unsigned int usTotalLines, unsigned int usBytesPerLine,
unsigned char ubMode);
-private unsigned int FrameTiff_Comp(unsigned char *lpSrcBuf, unsigned char *lpTgtBuf,
+static unsigned int FrameTiff_Comp(unsigned char *lpSrcBuf, unsigned char *lpTgtBuf,
unsigned int nSrcBytes);
-private unsigned int PreTiffComp(unsigned char *lpSrcBuf, unsigned int nSrcBytes);
-private long bmp2run(unsigned char *out_buf, unsigned char *in_buf, unsigned int sizeY, unsigned int sizeX, unsigned char ubMode);
+static unsigned int PreTiffComp(unsigned char *lpSrcBuf, unsigned int nSrcBytes);
+static long bmp2run(unsigned char *out_buf, unsigned char *in_buf, unsigned int sizeY, unsigned int sizeX, unsigned char ubMode);
#define ppdev ((gx_device_printer *)pdev)
/* Open the printer, adjusting the margins if necessary. */
-private int
+static int
gdi_open(gx_device *pdev)
{ /* Change the margins if necessary. */
const float *m = 0;
@@ -150,7 +150,7 @@
}
/* gdi_close is only here to eject odd numbered pages in duplex mode. */
-private int
+static int
gdi_close(gx_device *pdev)
{ if ( ppdev->Duplex_set >= 0 && ppdev->Duplex )
{ gdev_prn_open_printer(pdev, 1);
@@ -167,7 +167,7 @@
/* allow it to specify coordinates at 600 dpi. */
/* It too needs its coordinate system translated slightly. */
-private int
+static int
gdi_print_page(gx_device_printer *pdev, FILE *prn_stream)
{
int band_width_bytes;
Modified: trunk/gs/contrib/gdevhl12.c
===================================================================
--- trunk/gs/contrib/gdevhl12.c 2007-09-24 03:52:18 UTC (rev 8249)
+++ trunk/gs/contrib/gdevhl12.c 2007-09-25 13:31:24 UTC (rev 8250)
@@ -153,13 +153,13 @@
hl1250_tray_t source_tray;
} gx_device_hl1250;
-private dev_proc_open_device(hl1250_open);
-private dev_proc_close_device(hl1250_close);
-private dev_proc_print_page_copies(hl1250_print_page_copies);
-private dev_proc_get_params(hl1250_get_params);
-private dev_proc_put_params(hl1250_put_params);
+static dev_proc_open_device(hl1250_open);
+static dev_proc_close_device(hl1250_close);
+static dev_proc_print_page_copies(hl1250_print_page_copies);
+static dev_proc_get_params(hl1250_get_params);
+static dev_proc_put_params(hl1250_put_params);
-private const gx_device_procs prn_hl1250_procs =
+static const gx_device_procs prn_hl1250_procs =
prn_params_procs(hl1250_open, gdev_prn_output_page, hl1250_close,
hl1250_get_params, hl1250_put_params);
@@ -216,7 +216,7 @@
#if arch_is_big_endian
#define cpu_to_be16(x) (x)
#else
-private u16
+static u16
cpu_to_be16(u16 x)
{
return (x >> 8) | (x << 8);
@@ -244,7 +244,7 @@
returns 0 if the band is completely white, else 1
XXX - it should be faster to scan 32-bit (instead of 16-bit) words
*/
-private int
+static int
hl1250_check_area(hl1250_state_t * s)
{
unsigned int x, y, xleft, xright, ytop, ybottom;
@@ -291,7 +291,7 @@
Repeat each line using vertical compression, effectively reducing
resolution to 1200x300 dpi. This shouldn't happen too often.
*/
-private void
+static void
hl1250_lose_resolution(hl1250_state_t * s)
{
unsigned int x, y;
@@ -324,7 +324,7 @@
Return 1 on success, 0 on failure (data doesn't compress
well enough to fit in MAX_BAND_WORDS words, truncated).
*/
-private int
+static int
hl1250_compress_line(hl1250_state_t * s, unsigned int y)
{
unsigned int total_len; /* total data words after compression */
@@ -437,7 +437,7 @@
/*
send a 16-bit big endian value
*/
-private void
+static void
put_be16(FILE * fp, u16 data)
{
putc(data >> 8, fp);
@@ -449,7 +449,7 @@
s->xl,xr,yt,yb,in_buf = band (max 64 lines), coordinates band-relative
band = Y coordinate of the band from top of page
*/
-private void
+static void
hl1250_compress_band(FILE * prn_stream, hl1250_state_t * s, unsigned int band)
{
unsigned int y, ytop, ybottom;
@@ -492,7 +492,7 @@
}
-private int
+static int
hl1250_print_1200dpi(gx_device_printer * pdev, FILE * prn_stream,
int num_copies, const char *page_init)
{
@@ -556,7 +556,7 @@
}
-private int
+static int
hl1250_open(gx_device * pdev)
{
/* margins: left, bottom, right, top */
@@ -588,7 +588,7 @@
/* XXX - how to get the name of the job (PS file) being printed? */
#define PJL_JOB_NAME "Ghost"
-private int
+static int
hl1250_close(gx_device * pdev)
{
int code = gdev_prn_open_printer(pdev, 1);
@@ -606,7 +606,7 @@
}
-private int
+static int
hl1250_print_page_copies(gx_device_printer * pdev, FILE * prn_stream,
int num_copies)
{
@@ -673,7 +673,7 @@
return hl1250_print_1200dpi(pdev, prn_stream, num_copies, tray_pcl);
}
-private int
+static int
hl1250_put_param_int(gs_param_list * plist, gs_param_name pname,
int *pvalue, int minval, int maxval, int ecode)
{
@@ -693,7 +693,7 @@
}
}
-private int
+static int
hl1250_get_params(gx_device * pdev, gs_param_list * plist)
{
gx_device_hl1250 *hl1250 = (gx_device_hl1250 *) pdev;
@@ -715,7 +715,7 @@
return code;
}
-private int
+static int
hl1250_put_params(gx_device * pdev, gs_param_list * plist)
{
int code = 0;
Modified: trunk/gs/contrib/gdevln03.c
===================================================================
--- trunk/gs/contrib/gdevln03.c 2007-09-24 03:52:18 UTC (rev 8249)
+++ trunk/gs/contrib/gdevln03.c 2007-09-25 13:31:24 UTC (rev 8250)
@@ -42,15 +42,15 @@
#include "gdevprn.h"
/* Forward references */
-private int sixel_print_page(gx_device_printer *pdev, FILE *prn_stream,
+static int sixel_print_page(gx_device_printer *pdev, FILE *prn_stream,
const char *init, const char *eject);
/* The device descriptor */
-private dev_proc_output_page(sixel_output_page);
-private dev_proc_print_page(ln03_print_page);
+static dev_proc_output_page(sixel_output_page);
+static dev_proc_print_page(ln03_print_page);
/* We have to supply our own procs, since we have to intercept */
/* output_page so we can open the printer in text mode. */
-private gx_device_procs sixel_procs =
+static gx_device_procs sixel_procs =
prn_procs(gdev_prn_open, sixel_output_page, gdev_prn_close);
#ifdef A4
@@ -85,7 +85,7 @@
<FF> FF form feed */
#define LN03_EJECT "\033\\\f"
-private int
+static int
ln03_print_page(gx_device_printer *pdev, FILE *prn_stream)
{
return (sixel_print_page(pdev,prn_stream,LN03_INIT,LN03_EJECT));
@@ -94,7 +94,7 @@
/*
* DEClaser 2100 printer - very similar to the LN03.
*/
-private dev_proc_print_page(dl2100_print_page);
+static dev_proc_print_page(dl2100_print_page);
gx_device_printer gs_dl2100_device =
prn_device(sixel_procs, "dl2100",
DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
@@ -109,7 +109,7 @@
#define DL2100_INIT \
"\033[!p\033[11h\033[7 I\033[?52h\033[0t\033[1;2475s\033[1;3510r\033P0;0;1q\"1;1"
-private int
+static int
dl2100_print_page(gx_device_printer *pdev, FILE *prn_stream)
{
return (sixel_print_page(pdev,prn_stream,DL2100_INIT,LN03_EJECT));
@@ -119,7 +119,7 @@
* LA50 dot matrix printer device.
* This uses North American 8.5 x 11 inch paper size.
*/
-private dev_proc_print_page(la50_print_page);
+static dev_proc_print_page(la50_print_page);
gx_device_printer gs_la50_device =
prn_device(sixel_procs, "la50",
85,
@@ -136,7 +136,7 @@
<FF> FF form feed */
#define LA50_EJECT "\033\\\f"
-private int
+static int
la50_print_page(gx_device_printer *pdev, FILE *prn_stream)
{
return (sixel_print_page(pdev,prn_stream,LA50_INIT,LA50_EJECT));
@@ -146,7 +146,7 @@
* LA70 dot matrix printer device.
* This uses North American 8.5 x 11 inch paper size.
*/
-private dev_proc_print_page(la70_print_page);
+static dev_proc_print_page(la70_print_page);
gx_device_printer gs_la70_device =
prn_device(sixel_procs, "la70",
85,
@@ -162,7 +162,7 @@
<FF> FF form feed */
#define LA70_EJECT "\033\\\f"
-private int
+static int
la70_print_page(gx_device_printer *pdev, FILE *prn_stream)
{
return (sixel_print_page(pdev,prn_stream,LA70_INIT,LA70_EJECT));
@@ -172,7 +172,7 @@
* LA75 dot matrix printer device.
* This uses North American 8.5 x 11 inch paper size.
*/
-private dev_proc_print_page(la75_print_page);
+static dev_proc_print_page(la75_print_page);
gx_device_printer gs_la75_device =
prn_device(sixel_procs, "la75",
85,
@@ -188,7 +188,7 @@
<FF> FF form feed */
#define LA75_EJECT "\033\\\f"
-private int
+static int
la75_print_page(gx_device_printer *pdev, FILE *prn_stream)
{
return (sixel_print_page(pdev,prn_stream,LA75_INIT,LA75_EJECT));
@@ -199,7 +199,7 @@
* This uses either A4 or US paper size.
* Last changed: 03.02.94 -abp
*/
-private dev_proc_print_page(la75plus_print_page);
+static dev_proc_print_page(la75plus_print_page);
gx_device_printer gs_la75plus_device =
prn_device(sixel_procs, "la75plus",
85,
@@ -222,7 +222,7 @@
<FF> FF form feed */
#define LA75PLUS_EJECT "\033\\\f"
-private int
+static int
la75plus_print_page(gx_device_printer *pdev, FILE *prn_stream)
{
return (sixel_print_page(pdev,prn_stream,LA75PLUS_INIT,LA75PLUS_EJECT));
@@ -233,7 +233,7 @@
* Parameters set so MSKERMIT using sixels matches native EGA.
* COBE/DMR prefers (145, 100, 56.8, 28.5) to match its program DPSI.
*/
-private dev_proc_print_page(sxlcrt_print_page);
+static dev_proc_print_page(sxlcrt_print_page);
gx_device_printer gs_sxlcrt_device =
prn_device(sixel_procs,
"sxlcrt",
@@ -249,7 +249,7 @@
/* leave sixel graphics mode, home cursor */
#define SXLCRT_EJECT "\033\\\033[23;0H"
-private int
+static int
sxlcrt_print_page(gx_device_printer *pdev, FILE *prn_stream)
{
return (sixel_print_page(pdev,prn_stream,SXLCRT_INIT,SXLCRT_EJECT));
@@ -259,7 +259,7 @@
/* Open the printer in text mode before gdev_prn_output_page */
/* opens it in binary mode. */
-private int
+static int
sixel_output_page(gx_device *pdev, int num_copies, int flush)
{ int code = gdev_prn_open_printer(pdev, 0);
if ( code < 0 )
@@ -269,7 +269,7 @@
/* Send the page to the printer. */
/* Keep all lines <= 80 chars */
-private int
+static int
sixel_print_page(gx_device_printer *pdev, FILE *prn_stream,
const char *init, const char *eject)
{
Modified: trunk/gs/contrib/gdevlx32.c
===================================================================
--- trunk/gs/contrib/gdevlx32.c 2007-09-24 03:52:18 UTC (rev 8249)
+++ trunk/gs/contrib/gdevlx32.c 2007-09-25 13:31:24 UTC (rev 8250)
@@ -47,32 +47,32 @@
#endif
/* Prototypes for public routines */
-private dev_proc_map_rgb_color(lxm3200_map_rgb_color);
-private dev_proc_map_color_rgb(lxm3200_map_color_rgb);
-private dev_proc_print_page(lxm3200_print_page);
-private dev_proc_get_params(lxm3200_get_params);
-private dev_proc_put_params(lxm3200_put_params);
-private dev_proc_open_device(lxm3200_open);
+static dev_proc_map_rgb_color(lxm3200_map_rgb_color);
+static dev_proc_map_color_rgb(lxm3200_map_color_rgb);
+static dev_proc_print_page(lxm3200_print_page);
+static dev_proc_get_params(lxm3200_get_params);
+static dev_proc_put_params(lxm3200_put_params);
+static dev_proc_open_device(lxm3200_open);
/* Prototypes for internal routines */
-private void freeresources(gx_device *pdev);
-private byte calccheck8(byte *data);
-private void outputepilogue(void);
-private void skiplines(int skipcol, int skipin);
-private void fillheader(int head, int numcol, int firstcol, int bytes);
-private void finalizeheader(int vskip, int newhead);
-private void convbuf(int head, int numcols, int firstcol);
-private void encode_bw_buf(void);
-private void encode_col_buf(int head);
-private int fill_mono_buffer(int vline);
-private int init_buffer(void);
-private int qualify_buffer(void);
-private int roll_buffer(void);
-private void calclinemargins(byte *data, int mask, int *left, int *right);
-private void calcbufmargins(int head);
-private void print_color_page(void);
-private void print_mono_page(void);
-private void print_photo_page(void);
+static void freeresources(gx_device *pdev);
+static byte calccheck8(byte *data);
+static void outputepilogue(void);
+static void skiplines(int skipcol, int skipin);
+static void fillheader(int head, int numcol, int firstcol, int bytes);
+static void finalizeheader(int vskip, int newhead);
+static void convbuf(int head, int numcols, int firstcol);
+static void encode_bw_buf(void);
+static void encode_col_buf(int head);
+static int fill_mono_buffer(int vline);
+static int init_buffer(void);
+static int qualify_buffer(void);
+static int roll_buffer(void);
+static void calclinemargins(byte *data, int mask, int *left, int *right);
+static void calcbufmargins(int head);
+static void print_color_page(void);
+static void print_mono_page(void);
+static void print_photo_page(void);
/* Codes for the color indexes. */
#define WHITE 0x00 /* Pure white */
@@ -190,7 +190,7 @@
*/
/* Device procedures */
-private gx_device_procs lxm3200_procs =
+static gx_device_procs lxm3200_procs =
prn_color_params_procs(lxm3200_open, gdev_prn_output_page, gdev_prn_close,
lxm3200_map_rgb_color, lxm3200_map_color_rgb, lxm3200_get_params,
lxm3200_put_params);
@@ -245,8 +245,8 @@
/* --------- Static data --------- */
/* Lookup tables to speed up bitwise operations */
-private byte bits[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
-private byte ibits[8] = { 0x7f, 0xbf, 0xdf, 0xef, 0xf7, 0xfb, 0xfd, 0xfe };
+static byte bits[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
+static byte ibits[8] = { 0x7f, 0xbf, 0xdf, 0xef, 0xf7, 0xfb, 0xfd, 0xfe };
/* Lookup table for masking color pens in color/photo cartridges.
* This is used to check the raster buffer for the presence of a
@@ -256,7 +256,7 @@
* is the pen number (0 is the upper pen, 1 the middle pen, 2 the
* lower pen) on that cartridge.
*/
-private byte colmask[2][3] =
+static byte colmask[2][3] =
{
{ LIGHTCYAN, LIGHTMAGENTA, BLACK},
{ CYAN, MAGENTA, YELLOW }
@@ -269,7 +269,7 @@
* of each color pen relative to the vertical position of the
* color/photo cartridge.
*/
-private int penofs[3];
+static int penofs[3];
/* Lookup table for vertical alignment of the cartridges relative to
* each other. Parameter is the cartridge type: 0 = color cartridge,
@@ -279,19 +279,19 @@
* be no alignment problems (a single cartridge is always aligned
* with itself, otherwise the printer tray is faulty).
*/
-private int valign[3];
+static int valign[3];
/* Lookup table for horizontal offsets. First parameter is the
* head, second parameter the printing direction.
*/
-private int hoffset[2][2];
+static int hoffset[2][2];
/* Initialization sequence needed at the beginning of the data stream.
* This is invariant and contains a reset sequence, meaning each single
* page in a multiple page output is sent to the printer as an independent
* print job.
*/
-private byte init_sequence[] =
+static byte init_sequence[] =
{
0x1b, 0x2a, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
0x1b, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33,
@@ -299,7 +299,7 @@
0x1b, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21
};
-private byte z12_init_sequence[] =
+static byte z12_init_sequence[] =
{
0x1b, 0x2a, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
0x1b, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33,
@@ -369,7 +369,7 @@
} pagedata;
-private pagedata gendata;
+static pagedata gendata;
/* --------- Interface routines --------- */
@@ -382,7 +382,7 @@
* This routine is inspired by the omologous
* routine from the "gdevbj10" driver.
*/
-private int
+static int
lxm3200_open(gx_device *pdev)
{
float linewidth;
@@ -421,7 +421,7 @@
* value to the driver's internal representation
* of the nearest color.
*/
-private gx_color_index
+static gx_color_index
lxm3200_map_rgb_color(gx_device *dev, const gx_color_value cv[])
{
gx_color_index col;
@@ -493,7 +493,7 @@
* internal representation of a color to a
* RGB value.
*/
-private int
+static int
lxm3200_map_color_rgb(gx_device *dev, gx_color_index color,
gx_color_value prgb[3])
{
@@ -556,7 +556,7 @@
* and calls the proper page printing routines
* depending on the selected printing mode.
*/
-private int
+static int
lxm3200_print_page(gx_device_printer *pdev, FILE *prn_stream)
{
/* Store data passed by ghostscript to the driver */
@@ -788,7 +788,7 @@
* I won't comment it because I haven't even tried
* to understand this code... :)
*/
-private int
+static int
lxm3200_get_params(gx_device *pdev, gs_param_list *plist)
{
int code;
@@ -833,7 +833,7 @@
* I won't comment it because I haven't even tried
* to understand this code... :)
*/
-private int
+static int
lxm3200_put_params(gx_device *pdev, gs_param_list *plist)
{
int algnA = ((lxm_device *)pdev)->algnA;
@@ -943,7 +943,7 @@
/* --------- Internal routines --------- */
/* Free the resources allocated by the driver */
-private void
+static void
freeresources(gx_device *pdev)
{
if(gendata.scanbuf)
@@ -962,7 +962,7 @@
* data: pointer to the first of the 8 characters
* of an escape sequence.
*/
-private byte
+static byte
calccheck8(byte *data)
{
int ck, i;
@@ -977,7 +977,7 @@
* the escape sequence needed to eject the page and
* take the printheads to the "park" position.
*/
-private void
+static void
outputepilogue(void)
{
byte trailer[24];
@@ -1032,7 +1032,7 @@
* skiprow: number of buffer lines to skip
* vskip : fixed offset, in 1200ths of an inch
*/
-private void
+static void
skiplines(int skiprow, int skipin)
{
byte escape[8];
@@ -1072,7 +1072,7 @@
* bytes: total number of bytes in the stripe, including directories
* (but excluding the 24 bytes of the header).
*/
-private void
+static void
fillheader(int head, int numcol, int firstcol, int bytes)
{
int len, offs1, startabs;
@@ -1218,7 +1218,7 @@
* vskip : number of lines to skip to reach next stripe
* newhead: head used for the next stripe (LEFT or RIGHT)
*/
-private void
+static void
finalizeheader(int vskip, int newhead)
{
int offs2, nstartabs, back, fwd;
@@ -1411,7 +1411,7 @@
* numcols : number of columns in the buffer.
* firstcol: first column to print.
*/
-private void
+static void
convbuf(int head, int numcols, int firstcol)
{
byte *read, *write;
@@ -1580,7 +1580,7 @@
* prints the black part, which of course is the only
* one if we are printing in monochrome mode.
*/
-private void
+static void
encode_bw_buf(void)
{
int left, right, x, y, nn, mod;
@@ -1931,7 +1931,7 @@
* head: the head we are calculating the buffer for. It will
* be LEFT for a photo cartridge or RIGHT for a color one.
*/
-private void
+static void
encode_col_buf(int head)
{
int left, right, x, y, nn, mod;
@@ -2206,7 +2206,7 @@
*
* vline: the line from which to start searching for data.
*/
-private int
+static int
fill_mono_buffer(int vline)
{
byte *in_data, *data;
@@ -2319,7 +2319,7 @@
* printing commands to the printer only when there is something
* to print, there is no speed impact.
*/
-private int
+static int
init_buffer(void)
{
byte *in_data, *data;
@@ -2394,7 +2394,7 @@
* When we are printing in monochrome mode we directly skip
* over blank lines, so this routine is not needed.
*/
-private int
+static int
qualify_buffer(void)
{
int i, j, k, ret;
@@ -2497,7 +2497,7 @@
* and on the last pass we read the same line once more
* to lay down the cyan component.
*/
-private int
+static int
roll_buffer(void)
{
int i, ret, fline, vl, ofs;
@@ -2575,7 +2575,7 @@
* left: calculated left margin (output variable)
* right: calculated right margin (output variable)
*/
-private void
+static void
calclinemargins(byte *data, int mask, int *left, int *right)
{
int l,r,num;
@@ -2601,7 +2601,7 @@
* head: the code of the head we are calculating
* margins for (LEFT or RIGHT)
*/
-private void
+static void
calcbufmargins(int head)
{
int i, l1, r1, q, k;
@@ -2704,7 +2704,7 @@
* This is the main routine that prints in
* standard color mode.
*/
-private void
+static void
print_color_page(void)
{
int res, lline, cmask;
@@ -3079,7 +3079,7 @@
* only much simpler because now we are printing
* with only one head.
*/
-private void
+static void
print_mono_page(void)
{
int res, lline;
@@ -3179,7 +3179,7 @@
* no need to care for different heights of the
* printing pens (i.e.: no "lastblack" tricks).
*/
-private void
+static void
print_photo_page(void)
{
int res, lline;
Modified: trunk/gs/contrib/gdevlx50.c
===================================================================
--- trunk/gs/contrib/gdevlx50.c 2007-09-24 03:52:18 UTC (rev 8249)
+++ trunk/gs/contrib/gdevlx50.c 2007-09-25 13:31:24 UTC (rev 8250)
@@ -723,14 +723,14 @@
************************************************************************/
/* The procedure descriptors */
/* declare functions */
-private dev_proc_print_page(lx5000_print_page);
-private dev_proc_get_params(lx5000_get_params);
-private dev_proc_put_params(lx5000_put_params);
+static dev_proc_print_page(lx5000_print_page);
+static dev_proc_get_params(lx5000_get_params);
+static dev_proc_put_params(lx5000_put_params);
-private dev_proc_map_cmyk_color(lx5000_map_cmyk_color);
-private dev_proc_map_color_rgb(lx5000_map_color_rgb);
+static dev_proc_map_cmyk_color(lx5000_map_cmyk_color);
+static dev_proc_map_color_rgb(lx5000_map_color_rgb);
-private const gx_device_procs lx5000_procs =
+static const gx_device_procs lx5000_procs =
lx5000_proctab(
lx5000_get_params,
lx5000_put_params,
@@ -827,7 +827,7 @@
true /* isCMYK - defaults to using colour */
};
-private const gx_device_color_info color_info_cmy =
+static const gx_device_color_info color_info_cmy =
dci_values(NUM_COMPONENTS_CMY,
BITS_PER_PIXEL_CMY,
MAX_GREY_CMY,
@@ -835,7 +835,7 @@
DITHER_GREYS_CMY,
DITHER_COLOURS_CMY);
-private const gx_device_color_info color_info_blk =
+static const gx_device_color_info color_info_blk =
dci_values(NUM_COMPONENTS_BLK,
BITS_PER_PIXEL_BLK,
MAX_GREY_BLK,
@@ -857,7 +857,7 @@
* i n i t P e n C o n s t a n t s ( ) *
*----------------------------------------------------------------------*
*----------------------------------------------------------------------*/
-private void
+static void
initPenConstants( lx5000_device *lx5000dev,
penData pens[NUM_COLOURS][PENS_PER_COLOUR] )
{
@@ -965,7 +965,7 @@
* p a g e I n i t ( ) *
*----------------------------------------------------------------------*
*----------------------------------------------------------------------*/
-private void
+static void
pageInit( unsigned int alignA, unsigned int alignB, FILE *prn_stream )
{
static char page_init[] = {
@@ -982,7 +982,7 @@
* p a g e E n d ( ) *
*----------------------------------------------------------------------*
*----------------------------------------------------------------------*/
-private void
+static void
pageEnd( FILE *prn_stream )
{
static const char page_end[] = {
@@ -999,7 +999,7 @@
* f e e d P a p e r ( ) *
*----------------------------------------------------------------------*
*----------------------------------------------------------------------*/
-private void
+static void
feedPaper( lx5000_device *lx5000dev, int newLine, int *currentLine,
penData pens[NUM_COLOURS][PENS_PER_COLOUR],
FILE *prn_stream )
@@ -1206,7 +1206,7 @@
Things like dithering may well end up in here.
*----------------------------------------------------------------------*/
-private void
+static void
processCMYKline( lx5000_device *lx5000dev, int linenum,
byte *lineBuffer, byte *scanLine,
byte *colourBufs[NUM_COLOURS],
@@ -1351,7 +1351,7 @@
On return, nextLineToPrint must be set to the said line number, or beyond
the end of the page, if no more remain to be printed.
*----------------------------------------------------------------------*/
-private void
+static void
refreshBuffer( lx5000_device *lx5000dev,
int *nextLineToGet, int *nextLineToPrint,
byte *lineBuffer, byte *colourBufs[],
@@ -1474,7 +1474,7 @@
a line less than the current colour head position will be returned.
If colour is not defined, return a value off the end of the page.
*----------------------------------------------------------------------*/
-private int
+static int
cartridgeMoveTo( lx5000_device *lx5000dev,
penData pens[NUM_COLOURS][PENS_PER_COLOUR],
int _1stColour, int lastColour )
@@ -1511,7 +1511,7 @@
_1stColumn, lastColumn and columnExtent variables, calculate and set
these column variables after stripping leading and trailing white space.
*----------------------------------------------------------------------*/
-private void
+static void
setColourColumnExtent( lx5000_device *lx5000dev, byte *colourBuf,
bool lineEmpty[COLOUR_BUF_LINES],
int _1stLine, int _1stNozzle, int lastLine,
@@ -1579,7 +1579,7 @@
to the first actual column of each line, taking account of even and odd
nozzle numbers.
*----------------------------------------------------------------------*/
-private void
+static void
setColourLines( lx5000_device *lx5000dev,
byte *colourBuf, bufBit colourLines[COLOUR_BUF_LINES],
int _1stLine, int _1stNozzle, int lastLine, int direction,
@@ -1684,7 +1684,7 @@
* p r i n t S w i p e ( ) *
*----------------------------------------------------------------------*
*----------------------------------------------------------------------*/
-private void
+static void
printSwipe( lx5000_device *lx5000dev, byte *colourBufs[NUM_COLOURS],
bufBit
colourLines[NUM_COLOURS][PENS_PER_COLOUR][COLOUR_BUF_LINES],
@@ -2024,7 +2024,7 @@
*----------------------------------------------------------------------*
Send the page to the printer.
*----------------------------------------------------------------------*/
-private int
+static int
lx5000_print_page( gx_device_printer *pdev, FILE *prn_stream )
{
/*
@@ -2355,7 +2355,7 @@
/*----------------------------------------------------------------------*
* l x 5 0 0 0 b _ g e t _ p a r a m s ( ) *
*----------------------------------------------------------------------*/
-private int
+static int
lx5000_get_params( gx_device *pdev, gs_param_list *plist )
/*----------------------------------------------------------------------*/
{
@@ -2380,7 +2380,7 @@
/*----------------------------------------------------------------------*
* l x 5 0 0 0 b _ p u t _ p a r a m _ i n t ( ) *
*----------------------------------------------------------------------*/
-private int
+static int
lx5000_put_param_int(
gs_param_list *plist, gs_param_name pname,
int *pvalue, int minval, int maxval, int ecode
@@ -2410,7 +2410,7 @@
/*----------------------------------------------------------------------*
* l x 5 0 0 0 b _ p u t _ p a r a m _ b o o l ( ) *
*----------------------------------------------------------------------*/
-private int
+static int
lx5000_put_param_bool(
gs_param_list *plist, gs_param_name pname,
bool *pvalue, int ecode
@@ -2434,7 +2434,7 @@
/*----------------------------------------------------------------------*
* l x 5 0 0 0 b _ p u t _ p a r a m s ( ) *
*----------------------------------------------------------------------*/
-private int
+static int
lx5000_put_params( gx_device *pdev, gs_param_list *plist )
/*----------------------------------------------------------------------*/
/* put_params is supposed to check all the parameters before setting any. */
@@ -2571,7 +2571,7 @@
*----------------------------------------------------------------------*/
/* Map color to RGB. This has 3 separate cases, but since it is rarely */
/* used, we do a case test rather than providing 3 separate routines. */
-private int
+static int
lx5000_map_color_rgb(gx_device * dev, gx_color_index color,
gx_color_value rgb[3])
{
@@ -2603,7 +2603,7 @@
}
/* Map CMYK to color. */
-private gx_color_index
+static gx_color_index
lx5000_map_cmyk_color(gx_device * dev, const gx_color_value cv[])
{
int bpc = dev->color_info.depth / 4;
Modified: trunk/gs/contrib/gdevlx7.c
===================================================================
--- trunk/gs/contrib/gdevlx7.c 2007-09-24 03:52:18 UTC (rev 8249)
+++ trunk/gs/contrib/gdevlx7.c 2007-09-25 13:31:24 UTC (rev 8250)
@@ -102,9 +102,9 @@
/* The procedure descriptors */
/* declare functions */
-private dev_proc_print_page(lxmgen_print_page);
-private dev_proc_get_params(lxm_get_params);
-private dev_proc_put_params(lxm_put_params);
+static dev_proc_print_page(lxmgen_print_page);
+static dev_proc_get_params(lxm_get_params);
+static dev_proc_put_params(lxm_put_params);
/* set up dispatch table. I follow gdevdjet in using gdev_prn_output_page */
static const gx_device_procs lxm7000m_procs =
@@ -244,9 +244,9 @@
#define LX_LINE_EMPTY(buf,len) \
(buf[0]==0 && memcmp(buf,buf+1,len-1)==0)
-private byte ofs8[8]={128,64,32,16,8,4,2,1};
+static byte ofs8[8]={128,64,32,16,8,4,2,1};
/* Lexmark 5xxx, 7xxx page eject */
-private void lex_eject(FILE *out)
+static void lex_eject(FILE *out)
{
byte buf[4]={0x1b,0x2a,0x7,0x65};
#ifdef DEBUG
@@ -261,7 +261,7 @@
* 384 for 192 pixels or
* 416 for 208 pixels etc...
*/
-private void paper_shift(FILE *out,int offset)
+static void paper_shift(FILE *out,int offset)
{
byte buf[5]={0x1b,0x2a,0x3,0x0,0x0};
buf[3]=(byte)(offset >> 8); /* just to be endian safe we don't use short */
@@ -274,7 +274,7 @@
}
/* return coordinate of leftmost pixel (in pixels) */
-private int leftmost_pixel(byte *buf, int bytelen)
+static int leftmost_pixel(byte *buf, int bytelen)
{
int i;
byte *r=buf;
@@ -296,7 +296,7 @@
}
/* return coordinate of rightmost pixel (in pixels) */
-private int rightmost_pixel(byte *buf, int bytelen)
+static int rightmost_pixel(byte *buf, int bytelen)
{
int i;
byte *r=buf+(bytelen-1);
@@ -327,7 +327,7 @@
* leftmost,
* rightmost - output
*/
-private void find_lr_pixels(byte *buf[],int bytelen,int bufheight,
+static void find_lr_pixels(byte *buf[],int bytelen,int bufheight,
int interlaced, int intershift,
int *leftmost, int *rightmost)
{
@@ -367,18 +367,18 @@
/* ------ Driver procedures ------ */
/*** THIS NEED TO BE REWORKED SOON ***/
-private const int LEFT_MARGIN=50;
-private const int VERTSIZE=LX7_BSW_H;
+static const int LEFT_MARGIN=50;
+static const int VERTSIZE=LX7_BSW_H;
/* offsets to print line sequence (defined in outbuf)
*/
-private const int IDX_SEQLEN=5;
-private const int IDX_HORRES=8;
-private const int IDX_PACKETS=13;
-private const int IDX_5700DIF=12;
-private const int IDX_HSTART=15;
-private const int IDX_HEND=17;
-private const int IDX_DATA=26;
-private const int IDX_CARTRIDGE=10;
+static const int IDX_SEQLEN=5;
+static const int IDX_HORRES=8;
+static const int IDX_PACKETS=13;
+static const int IDX_5700DIF=12;
+static const int IDX_HSTART=15;
+static const int IDX_HEND=17;
+static const int IDX_DATA=26;
+static const int IDX_CARTRIDGE=10;
#define DIV8(x) ( (x) >> 3 )
#define MOD8(x) ( (x) & 0x7 )
@@ -393,7 +393,7 @@
* by lxmgen_print_page() to avoid large static array
* in gs binary
*/
-private byte outb[]={0x1B,0x2A,0x04,0x00,0x00,0xFF,0xFF,
+static byte outb[]={0x1B,0x2A,0x04,0x00,0x00,0xFF,0xFF,
/* number of packets ---- vvvvvvvvv */
0x00,0x02,0x01,0x01,0x1A,0x11,0xFF,0xFF,
/* horiz start, horiz end: packets = (horiz end - horiz start) +1 */
@@ -401,7 +401,7 @@
#define BITSTART12 4096
-private int print_cols(FILE *prn_stream,gx_device_printer *pdev,
+static int print_cols(FILE *prn_stream,gx_device_printer *pdev,
byte *outbuf,
int left,int right,int vstart, int vend,byte *buf[],
int width,int LR_SHIFT)
@@ -559,7 +559,7 @@
/* Send the page to the printer. */
/* Lexmark generic print page routine */
-private int
+static int
lxmgen_print_page(gx_device_printer *pdev, FILE *prn_stream)
{
int pheight=pdev->height; /* page height (pixels) */
@@ -812,7 +812,7 @@
return 0;
}
- private int
+ static int
lxm_get_params(gx_device *pdev, gs_param_list *plist)
{
lxm_device* const ldev = (lxm_device*)pdev;
@@ -827,7 +827,7 @@
}
/* put_params is supposed to check all the parameters before setting any. */
-private int
+static int
lxm_put_params(gx_device *pdev, gs_param_list *plist)
{
int ecode;
Modified: trunk/gs/contrib/gdevmd2k.c
===================================================================
--- trunk/gs/contrib/gdevmd2k.c 2007-09-24 03:52:18 UTC (rev 8249)
+++ trunk/gs/contrib/gdevmd2k.c 2007-09-25 13:31:24 UTC (rev 8250)
@@ -35,15 +35,15 @@
#define RIGHT_MARGIN 3.4 / MM_PER_INCH
/* The device descriptor */
-private dev_proc_open_device(alps_open);
-private dev_proc_get_params(alps_get_params);
-private dev_proc_put_params(alps_put_params);
-private dev_proc_print_page(md2k_print_page);
-private dev_proc_print_page(md5k_print_page);
-private dev_proc_map_cmyk_color(alps_map_cmyk_color);
-private dev_proc_map_cmyk_color(alps_map_cmy_color);
-private dev_proc_map_rgb_color(alps_map_rgb_color);
-private dev_proc_map_color_rgb(alps_map_color_rgb);
+static dev_proc_open_device(alps_open);
+static dev_proc_get_params(alps_get_params);
+static dev_proc_put_params(alps_put_params);
+static dev_proc_print_page(md2k_print_page);
+static dev_proc_print_page(md5k_print_page);
+static dev_proc_map_cmyk_color(alps_map_cmyk_color);
+static dev_proc_map_cmyk_color(alps_map_cmy_color);
+static dev_proc_map_rgb_color(alps_map_rgb_color);
+static dev_proc_map_color_rgb(alps_map_color_rgb);
struct gx_device_alps_s {
@@ -65,7 +65,7 @@
#define dev_alps ((gx_device_alps *) pdev)
-private gx_device_procs alps_procs = {
+static gx_device_procs alps_procs = {
alps_open,
gx_default_get_initial_matrix,
NULL, /* sync_output */
@@ -109,7 +109,7 @@
} alps_printer_type;
-private int
+static int
alps_open(gx_device *pdev)
{
int xdpi = pdev->x_pixels_per_inch;
@@ -140,7 +140,7 @@
}
-private int
+static int
alps_get_params(gx_device *pdev, gs_param_list *plist)
{
gs_param_string mediaType = { "", 1, false };
@@ -164,7 +164,7 @@
return code;
}
-private int
+static int
alps_put_param_bool(gs_param_list *plist, gs_param_name pname, int *pvalue,
int ecode)
{
@@ -180,7 +180,7 @@
}
}
-private int
+static int
alps_put_param_int(gs_param_list *plist, gs_param_name pname, int *pvalue,
int minval, int maxval, int ecode)
{
@@ -199,7 +199,7 @@
}
/* Put properties. */
-private int
+static int
alps_put_params(gx_device *pdev, gs_param_list *plist)
{
int code = 0;
@@ -339,7 +339,7 @@
/*
* get a component of CMYK from raster data
*/
-private int
+static int
cmyk_to_bit(byte *out, byte *in, int length, int c_comp)
{
byte *p_in = in, *p_out = out, *p_end;
@@ -370,7 +370,7 @@
/*
* run-length compression
*/
-private int
+static int
runlength(byte *out, byte *in, int length)
{
byte *p_in = in, *p_out = out, *p_end;
@@ -419,7 +419,7 @@
fputc(cmd2, stream); \
}
-private void
+static void
alps_init(gx_device_printer *pdev, FILE *prn_stream, alps_printer_type ptype)
{
short height; /* page height (unit: dots) */
@@ -482,7 +482,7 @@
}
/* Send the page to the printer. */
-private int
+static int
alps_print_page(gx_device_printer *pdev, FILE *prn_stream,
alps_printer_type ptype)
{
@@ -601,13 +601,13 @@
return 0;
}
-private int
+static int
md2k_print_page(gx_device_printer *pdev, FILE *prn_stream)
{
return alps_print_page(pdev, prn_stream, MD2000);
}
-private int
+static int
md5k_print_page(gx_device_printer *pdev, FILE *prn_stream)
{
return alps_print_page(pdev, prn_stream, MD5000);
@@ -637,7 +637,7 @@
(y) = gx_bits_to_color_value(((v) >> (b)) & ((1 << (b)) - 1), (b)), \
(k) = gx_bits_to_color_value((v) & ((1 << (b)) - 1), (b))
-private gx_color_index
+static gx_color_index
alps_map_cmyk_color(gx_device* pdev,
const gx_color_value cv[])
{
@@ -675,7 +675,7 @@
return color;
}
-private gx_color_index
+static gx_color_index
alps_map_cmy_color(gx_device* pdev,
const gx_color_value cv[])
{
@@ -694,7 +694,7 @@
/* Mapping of RGB colors to gray values. */
-private gx_color_index
+static gx_color_index
alps_map_rgb_color(gx_device *pdev,
const gx_color_value cv[])
{
@@ -731,7 +731,7 @@
/* Mapping of CMYK colors. */
-private int
+static int
alps_map_color_rgb(gx_device *pdev,
gx_color_index color, gx_color_value prgb[3])
{
Modified: trunk/gs/contrib/gdevop4w.c
===================================================================
--- trunk/gs/contrib/gdevop4w.c 2007-09-24 03:52:18 UTC (rev 8249)
+++ trunk/gs/contrib/gdevop4w.c 2007-09-25 13:31:24 UTC (rev 8250)
@@ -90,11 +90,11 @@
#define byte unsigned char
/* The device descriptors */
-private dev_proc_open_device(oki4w_open);
-private dev_proc_close_device(oki4w_close);
-private dev_proc_print_page(oki4w_print_page);
+static dev_proc_open_device(oki4w_open);
+static dev_proc_close_device(oki4w_close);
+static dev_proc_print_page(oki4w_print_page);
-private gx_device_procs prn_hp_procs =
+static gx_device_procs prn_hp_procs =
prn_params_procs(oki4w_open, gdev_prn_output_page, oki4w_close,
gdev_prn_get_params, gdev_prn_put_params);
@@ -108,7 +108,7 @@
#define ppdev ((gx_device_printer *)pdev)
/* Find out paper size code */
-private int
+static int
oki_paper_size(gx_device *dev)
{
float height_inches = dev->height / dev->y_pixels_per_inch;
@@ -121,7 +121,7 @@
}
/* Open the printer, adjusting the margins if necessary. */
-private int
+static int
oki4w_open(gx_device *pdev)
{ /* Change the margins if necessary. */
const float *m = 0;
@@ -134,7 +134,7 @@
}
/* oki4w_close is only here to eject odd numbered pages in duplex mode. */
-private int
+static int
oki4w_close(gx_device *pdev)
{
/*
@@ -152,7 +152,7 @@
/* ------ Internal routines ------ */
-private int
+static int
oki_compress(byte *src, byte *dst, int count)
{
int dcnt = 0;
@@ -227,7 +227,7 @@
/* Send the page to the printer. For speed, compress each scan line, */
/* since computer-to-printer communication time is often a bottleneck. */
-private int
+static int
oki4w_print_page(gx_device_printer *pdev, FILE *prn_stream)
{
int line_size = gdev_mem_bytes_per_scan_line((gx_device *)pdev);
Modified: trunk/gs/contrib/gdevxes.c
===================================================================
--- trunk/gs/contrib/gdevxes.c 2007-09-24 03:52:18 UTC (rev 8249)
+++ trunk/gs/contrib/gdevxes.c 2007-09-25 13:31:24 UTC (rev 8250)
@@ -42,13 +42,13 @@
#include "gdevprn.h"
/* Forward references */
-private int sixel_print_page(gx_device_printer *pdev,
+static int sixel_print_page(gx_device_printer *pdev,
FILE *prn_stream, const char *init);
/* The device descriptor */
-private dev_proc_output_page(sixel_output_page);
-private dev_proc_print_page(xes_print_page);
-private gx_device_procs xes_procs =
+static dev_proc_output_page(sixel_output_page);
+static dev_proc_print_page(xes_print_page);
+static gx_device_procs xes_procs =
prn_procs(gdev_prn_open, sixel_output_page, gdev_prn_close);
#ifdef A4
@@ -77,7 +77,7 @@
#define XES_GRAPHICS \
"\033gw1;"
-private int
+static int
xes_print_page(gx_device_printer *pdev, FILE *prn_stream)
{
return (sixel_print_page(pdev,prn_stream,XES_RESET));
@@ -87,7 +87,7 @@
/* Open the printer in text mode before gdev_prn_output_page */
/* opens it in binary mode. */
-private int
+static int
sixel_output_page(gx_device *pdev, int num_copies, int flush)
{ int code = gdev_prn_open_printer(pdev, 0);
if ( code < 0 )
@@ -96,7 +96,7 @@
}
/* Send the page to the printer. */
-private int
+static int
sixel_print_page(gx_device_printer *pdev, FILE *prn_stream, const char *init)
{
byte *buf, *b, *end;
Modified: trunk/gs/contrib/gomni.c
==========================