Delete gs_l2img.ps, and all references in makefiles and docs.

This is dead code that apparently hasn't been used for years.  It was
defining some things in systemdict (.colorspaceimage, .csinextbits)
that are now also gone.

7 files changed, 6 insertions, 208 deletions

diff --git a/Resource/Init/gs_l2img.ps b/Resource/Init/gs_l2img.ps
deleted file mode 100644
index c448fc423..000000000
--- a/Resource/Init/gs_l2img.ps
+++ /dev/null
@@ -1,183 +0,0 @@
-% Copyright (C) 2001-2018 Artifex Software, Inc.
-% All Rights Reserved.
-%
-% This software is provided AS-IS with no warranty, either express or
-% implied.
-%
-% This software is distributed under license and may not be copied,
-% modified or distributed except as expressly authorized under the terms
-% of the license contained in the file LICENSE in this distribution.
-%
-% Refer to licensing information at http://www.artifex.com or contact
-% Artifex Software, Inc.,  1305 Grant Avenue - Suite 200, Novato,
-% CA 94945, U.S.A., +1(415)492-9861, for further information.
-%
-
-% Emulate the Level 2 dictionary-based image operator in Level 1,
-% except for Interpolate (ignored) and MultipleDataSources = true;
-% also, we require that the data source be either a procedure of a
-% particular form or a stream, not a string or a general procedure.
-
-% pdf2ps copies the portion of this file from %BEGIN to %END if Level 1
-% compatible output is requested.
-
-/currentglobal where
- { pop currentglobal { setglobal } //true setglobal }
- { { } }
-ifelse
-
-/packedarray where
- { pop }
- { /packedarray { array astore readonly } bind def }
-ifelse
-
-%BEGIN
-
-11 dict /.csncompdict 1 index def begin
-  /DeviceGray { 1 /setgray load } bind def
-  /DeviceRGB { 3 /setrgbcolor load } bind def
-  /DeviceCMYK { 4 /setcmykcolor load } bind def
-  /Indexed
-   { dup 1 index 1 get //.csncompdict exch get exec
-                % Stack: [/Indexed base hival map] ncomp basesetcolor
-     3 -1 roll 3 get mark 3 1 roll
-                % Stack: ncomp -mark- basesetcolor map
-     dup type /stringtype eq
-      {  { -
-            { exch round cvi get 255 div
-            }
-           -
-            { exch round cvi 3 mul 2 copy 2 copy get 255 div
-              3 1 roll 1 add get 255 div
-              4 2 roll 2 add get 255 div
-            }
-            { exch round cvi 4 mul 2 copy 2 copy 2 copy get 255 div
-              3 1 roll 1 add get 255 div
-              4 2 roll 2 add get 255 div
-              5 3 roll 3 add get 255 div
-            }
-         }
-        4 index get aload pop counttomark -1 roll
-      }
-      { /exec load 3 -1 roll
-                % Stack: -mark- mapproc --exec-- basesetcolor
-      }
-     ifelse .packtomark cvx
-     exch pop 1 exch
-   } bind def
-  /Separation
-   { dup 2 index //.csncompdict exch get exec
-                % Stack: [/Separation name alt xform] ncomp altsetcolor
-     3 -1 roll 3 get /exec load 3 -1 roll 3 array astore readonly cvx
-     exch pop 1 exch
-   } bind def
-        % Substitute device spaces for CIE spaces.
-  /CIEBasedA /DeviceGray load def
-  /CIEBasedABC /DeviceRGB load def
-  /CIEBasedDEF /DeviceRGB load def
-  /CIEBasedDEFG /DeviceCMYK load def
-end
-
-/.packtomark { counttomark packedarray exch pop } bind def
-
-/.csinextbits		% - .csinextbits <bits>
-                        % Uses b, nnb, i, row, mask, BitsPerComponent;
-                        % sets b, nnb, i.
- { /nnb nnb BitsPerComponent add
-    { dup 0 le { exit } if
-      /b b 8 bitshift row i get add def
-      /i i 1 add def  8 sub
-    }
-   loop def
-   b nnb bitshift mask and
- } bind def
-
-% Note that the ColorSpace key must be present in the image dictionary.
-/.colorspaceimage		% <imagedict> .colorspaceimage -
- { save exch
-   dup length 15 add dict begin { cvlit def } forall
-   ColorSpace dup dup type /nametype ne { 0 get } if
-   .csncompdict exch get exec
-     /setpixelcolor exch def  /ncomp exch def  pop
-   /row ncomp BitsPerComponent mul Width mul 7 add 8 idiv string def
-      /mask 1 BitsPerComponent bitshift 1 sub def
-      /nextbits BitsPerComponent 8 eq
-       { { row i get /i i 1 add def } }
-       { /.csinextbits load }
-      ifelse def
-      /nextpixel mark 0 2 ncomp 1 sub 2 mul
-       { /nextbits cvx exch
-         Decode exch 2 getinterval
-         dup aload pop exch sub
-         dup mask eq { pop } { mask div /mul load 3 -1 roll } ifelse
-         0 get dup 0 eq { pop } { /sub load 3 -1 roll } ifelse
-       }
-      for
-      /setpixelcolor load dup type /operatortype ne { /exec load } if
-      .packtomark cvx def
-      /readrow
-        /DataSource load dup type
-        dup /arraytype eq exch /packedarraytype eq or
-        {	% Must be { <file> <string> ... }
-          aload length 1 add array /pop load exch astore
-          dup 1 row put cvx
-        }
-        { pop
-                % Adobe requires readstring to signal an error if given
-                % an empty string.  Work around this nonsense here.
-          row length 0 eq
-           { { } }
-           { { DataSource row readstring pop pop } }
-          ifelse
-        }
-      ifelse def
-      ImageMatrix matrix invertmatrix concat
-      /imat matrix def
-      0 1 Height 1 sub
-       { imat 5 3 -1 roll neg put
-         readrow
-         /b 0 def  /nnb 0 def  /i 0 def
-         0 1 Width 1 sub
-          { imat 4 3 -1 roll neg put nextpixel
-            1 1 //true imat {<80>} imagemask
-          }
-         for
-       }
-      for
-   end restore
- } bind def
-
-%END
-exec
-currentfile closefile
-
-% Patch for testing.
-/.cincompdict 3 dict begin
-  1 { {0 1} {/DeviceGray} } def
-  3 { {0 1 0 1 0 1} {/DeviceRGB} } def
-  4 { {0 1 0 1 0 1 0 1} {/DeviceCMYK} } def
-currentdict end def
-/.imagekeys [
-  /Decode /DataSource /ImageMatrix /BitsPerComponent /Height /Width
-] def
-/colorimage		% <width> <height> <bits/comp> <matrix>
-                        %   <datasrc> false <ncomp> colorimage -
- { 1 index { /colorimage .systemvar /rangecheck signalerror } if exch pop
-   //.cincompdict exch get exec
-   7 dict begin /ColorSpace exch cvlit def
-   .imagekeys { exch cvlit def } forall
-   currentdict end .colorspaceimage
- } bind odef
-/image
- { dup type /dicttype ne
-    { 7 dict begin /ColorSpace /DeviceGray def [0 1]
-      .imagekeys { exch cvlit def } forall
-      currentdict end
-    }
-    { dup length 1 add dict .copydict dup /ColorSpace currentcolorspace put
-    }
-   ifelse
-   .colorspaceimage
- } bind odef
-
-exec
diff --git a/doc/Develop.htm b/doc/Develop.htm
index 23b4fa1d9..0bdbaaaf5 100644
--- a/doc/Develop.htm
+++ b/doc/Develop.htm
@@ -2877,12 +2877,6 @@ PDF/X-3 definition file sample :
 <dd>
 <a href="../lib/PDFX_def.ps">lib/PDFX_def.ps</a>,
 
-<dt>
-Not currently used:
-<dd>
-<a href="../lib/gs_cmdl.ps">lib/gs_cmdl.ps</a>,
-<a href="../Resource/Init/gs_l2img.ps">Resource/Init/gs_l2img.ps</a>.
-
 </dl>
 
 </dl>
diff --git a/doc/Psfiles.htm b/doc/Psfiles.htm
index 501ca134c..ded71862b 100644
--- a/doc/Psfiles.htm
+++ b/doc/Psfiles.htm
@@ -447,12 +447,6 @@ These files are found in the <code>Resource/Init</code> subdirectory of
 the Ghostscript source distribution.</p>
 
 <dl>
-<dt><a href="../Resource/Init/gs_l2img.ps"><code>gs_l2img.ps</code></a></dt>
-<dd>The <code>ProcSet</code> that emulates the PostScript Level 2
-"<code>image</code>" operator on Level 1 systems.</dd>
-</dl>
-
-<dl>
 <dt><a href="../Resource/Init/pdf_base.ps"><code>pdf_base.ps</code></a></dt>
 <dd>Utilities for interpreting PDF objects and streams.</dd>
 </dl>
diff --git a/psi/int.mak b/psi/int.mak
index 6ab5bf006..2e0067b81 100644
--- a/psi/int.mak
+++ b/psi/int.mak
@@ -479,7 +479,7 @@ $(PSOBJ)zcolor.$(OBJ) : $(PSSRC)zcolor.c $(OP)\
  $(idict_h) $(icolor_h) $(idparam_h) $(iname_h) $(iutil_h) $(icsmap_h)\
  $(ifunc_h) $(zht2_h) $(zcolor_h) $(zcie_h) $(zicc_h) $(gscspace_h)\
  $(zfrsd_h) $(INT_MAK) $(MAKEDIRS)
-	$(PSCC) $(PSO_)zcolor.$(OBJ) $(C_) $(PSSRC)zcolor.c 
+	$(PSCC) $(PSO_)zcolor.$(OBJ) $(C_) $(PSSRC)zcolor.c
 
 $(PSOBJ)zdevice.$(OBJ) : $(PSSRC)zdevice.c $(OP) $(string__h)\
  $(ialloc_h) $(idict_h) $(igstate_h) $(iname_h) $(interp_h) $(iparam_h) $(ivmspace_h)\
@@ -848,7 +848,7 @@ type42read_=$(PSOBJ)zchar42.$(OBJ) $(PSOBJ)zcharout.$(OBJ) $(PSOBJ)zfont42.$(OBJ
 $(PSD)type42.dev : $(ECHOGS_XE) $(type42read_) $(GLD)ttflib.dev\
  $(INT_MAK) $(MAKEDIRS)
 	$(SETMOD) $(PSD)type42 $(type42read_)
-	$(ADDMOD) $(PSD)type42 -include $(GLD)ttflib	
+	$(ADDMOD) $(PSD)type42 -include $(GLD)ttflib
 	$(ADDMOD) $(PSD)type42 -oper zchar42 zfont42
 	$(ADDMOD) $(PSD)type42 -ps gs_typ42
 
@@ -1219,7 +1219,7 @@ $(PSD)jbig2_luratech.dev : $(ECHOGS_XE) $(fjbig2_) $(GLD)sjbig2.dev\
 	$(ADDMOD) $(PSD)jbig2_luratech -oper zfjbig2
 
 $(PSD)jbig2_.dev : $(ECHOGS_XE) $(INT_MAK) $(MAKEDIRS)
-	$(SETMOD) $(PSD)jbig2_ 
+	$(SETMOD) $(PSD)jbig2_
 
 $(PSD)jbig2.dev : $(PSD)jbig2_$(JBIG2_LIB).dev $(INT_MAK) $(MAKEDIRS)
 	$(CP_) $(PSD)jbig2_$(JBIG2_LIB).dev $(PSD)jbig2.dev
@@ -1840,7 +1840,7 @@ $(PSD)pdfread.dev : $(ECHOGS_XE) \
  $(INT_MAK) $(MAKEDIRS)
 	$(SETMOD) $(PSD)pdfread -include $(PSD)frsd $(PSD)func4 $(PSD)fzlib
 	$(ADDMOD) $(PSD)pdfread -include $(PSD)transpar
-	$(ADDMOD) $(PSD)pdfread -ps pdf_ops gs_l2img
+	$(ADDMOD) $(PSD)pdfread -ps pdf_ops
 	$(ADDMOD) $(PSD)pdfread -ps pdf_rbld
 	$(ADDMOD) $(PSD)pdfread -ps pdf_base pdf_draw pdf_font pdf_main pdf_sec
 
diff --git a/psi/psromfs.mak b/psi/psromfs.mak
index b8021bb25..75dea02c4 100644
--- a/psi/psromfs.mak
+++ b/psi/psromfs.mak
@@ -300,7 +300,7 @@ PS_COLORSPACE_DEPS=\
 	$(PSRESDIR)$(D)ColorSpace$(D)DefaultRGB \
 	$(PSRESDIR)$(D)ColorSpace$(D)TrivialCMYK \
 	$(PSRESDIR)$(D)ColorSpace$(D)sGray \
-	$(PSRESDIR)$(D)ColorSpace$(D)sRGB 
+	$(PSRESDIR)$(D)ColorSpace$(D)sRGB
 
 # A list of all of the files in Resource/Decoding
 PS_DECODING_DEPS=\
@@ -310,7 +310,7 @@ PS_DECODING_DEPS=\
 	$(PSRESDIR)$(D)Decoding$(D)FCO_Wingdings \
 	$(PSRESDIR)$(D)Decoding$(D)Latin1 \
 	$(PSRESDIR)$(D)Decoding$(D)StandardEncoding \
-	$(PSRESDIR)$(D)Decoding$(D)Unicode 
+	$(PSRESDIR)$(D)Decoding$(D)Unicode
 
 # A list of all of the files in Resource/Encoding
 PS_ENCODING_DEPS=\
@@ -391,7 +391,6 @@ PS_INIT_DEPS=\
 	$(PSRESDIR)$(D)Init$(D)gs_icc.ps \
 	$(PSRESDIR)$(D)Init$(D)gs_il1_e.ps \
 	$(PSRESDIR)$(D)Init$(D)gs_img.ps \
-	$(PSRESDIR)$(D)Init$(D)gs_l2img.ps \
 	$(PSRESDIR)$(D)Init$(D)gs_lev2.ps \
 	$(PSRESDIR)$(D)Init$(D)gs_ll3.ps \
 	$(PSRESDIR)$(D)Init$(D)gs_mex_e.ps \
@@ -435,4 +434,3 @@ PS_ROMFS_DEPS=$(PSSRCDIR)$(D)psromfs.mak $(gconfig_h) $(gs_tr) \
 	$(PDF_RESOURCE_DEPS) $(PS_COLORSPACE_DEPS) $(PS_DECODING_DEPS) $(PS_ENCODING_DEPS) \
 	$(PS_FONT_DEPS) $(PS_IDIOMSET_DEPS) $(PS_PROCSET_DEPS) $(PS_INIT_DEPS) $(PS_SUBSTCID_DEPS) \
 	$(PS_MISC_DEPS)
-
diff --git a/windows/ghostscript.vcproj b/windows/ghostscript.vcproj
index 9c2e6ae3f..c58926c75 100644
--- a/windows/ghostscript.vcproj
+++ b/windows/ghostscript.vcproj
@@ -1413,10 +1413,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\Resource\Init\gs_l2img.ps"
-					>
-				</File>
-				<File
 					RelativePath="..\Resource\Init\gs_lev2.ps"
 					>
 				</File>
diff --git a/windows/ghostscript_rt.vcxproj b/windows/ghostscript_rt.vcxproj
index 1aac5e2f8..42e6fe474 100644
--- a/windows/ghostscript_rt.vcxproj
+++ b/windows/ghostscript_rt.vcxproj
@@ -2626,7 +2626,6 @@
     <None Include="..\Resource\Init\gs_il1_e.ps" />
     <None Include="..\Resource\Init\gs_img.ps" />
     <None Include="..\Resource\Init\gs_init.ps" />
-    <None Include="..\Resource\Init\gs_l2img.ps" />
     <None Include="..\Resource\Init\gs_lev2.ps" />
     <None Include="..\Resource\Init\gs_ll3.ps" />
     <None Include="..\Resource\Init\gs_mex_e.ps" />