diff options
Diffstat (limited to 'gs')
792 files changed, 2058 insertions, 1722 deletions
diff --git a/gs/gdevpfax.c b/gs/gdevpfax.c index e181aa33b..db227b981 100644 --- a/gs/gdevpfax.c +++ b/gs/gdevpfax.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic PostScript system compatible fax support */ #include "gdevprn.h" #include "gsparam.h" diff --git a/gs/lib/gs_init.ps b/gs/lib/gs_init.ps index 26c9e0398..bc2c82d31 100644 --- a/gs/lib/gs_init.ps +++ b/gs/lib/gs_init.ps @@ -31,7 +31,7 @@ % Check the interpreter revision. NOTE: the interpreter code requires % that the first non-comment token in this file be an integer. -534 +535 dup revision ne { (gs: Interpreter revision \() print revision 10 string cvs print (\) does not match gs_init.ps revision \() print 10 string cvs print diff --git a/gs/lib/gs_lev2.ps b/gs/lib/gs_lev2.ps index 87a327b6f..38c820d05 100644 --- a/gs/lib/gs_lev2.ps +++ b/gs/lib/gs_lev2.ps @@ -85,7 +85,8 @@ counttomark 2 idiv { } .bind def end /currentuserparams { % - currentuserparams <dict> - /userparams .systemvar dup length dict .copydict + /userparams .systemvar dup length + .currentglobal false .setglobal exch dict exch .setglobal .copydict } odef /setuserparams { % <dict> setuserparams - % Check that we will be able to set the PostScript-level diff --git a/gs/lib/gs_ttf.ps b/gs/lib/gs_ttf.ps index 96815d431..b3a31e547 100644 --- a/gs/lib/gs_ttf.ps +++ b/gs/lib/gs_ttf.ps @@ -20,73 +20,69 @@ % (Not needed for Type 42 fonts.) % Thanks to B. Jackowski and GUST (the Polish TeX Users' Group) for -% improvements to this code. +% the glyf-splitting code. % ---------------- Font loading machinery ---------------- % % Augment the FONTPATH machinery so it recognizes TrueType fonts. -/.scanfontheaders where % only defined if DISKFONTS is recognized - { pop - /.scanfontheaders [ .scanfontheaders aload pop (\000\001\000\000*) ] def - } -if +/.scanfontheaders where { % only defined if DISKFONTS is recognized + pop /.scanfontheaders [ .scanfontheaders aload pop (\000\001\000\000*) ] def +} if + +% <file> <key> .findfontvalue <value> true +% <file> <key> .findfontvalue false +% Closes the file in either case. /.findnonttfontvalue /.findfontvalue load def -/.findfontvalue % <file> <key> .findfontvalue <value> true - % <file> <key> .findfontvalue false - % Closes the file in either case. - { 1 index read pop 2 index 1 index unread 0 eq - { % If this is a font at all, it's a TrueType font. - dup /FontType eq - { pop closefile 42 true } - { dup /FontName eq - { pop .findttfontname } - { pop closefile false } - ifelse - } - ifelse - } - { % Not a TrueType font. - .findnonttfontvalue - } - ifelse - } bind def -/.findttfontname % <file> .findttfontname <fname> true - % <file> .findttfontname false - % Closes the file in either case. - { .loadttfonttables - (name) findtableentry - { dup 8 getu32 f exch setfileposition - 12 getu32 string f exch readstring pop - 6 findname - } - { false - } - ifelse - f closefile end end - } bind def +/.findfontvalue { + 1 index read pop 2 index 1 index unread 0 eq { + % If this is a font at all, it's a TrueType font. + dup /FontType eq { + pop closefile 42 true + } { + dup /FontName eq { pop .findttfontname } { pop closefile false } ifelse + } ifelse + } { + % Not a TrueType font. + .findnonttfontvalue + } ifelse +} bind def + +% <file> .findttfontname <fname> true +% <file> .findttfontname false +% Closes the file in either case. +/.findttfontname { + .loadttfonttables + tabdict /name .knownget { + dup 8 getu32 f exch setfileposition + 12 getu32 string f exch readstring pop + 6 findname + } { + false + } ifelse + f closefile end end +} bind def % Load a font file that might be a TrueType font. +% <file> .loadfontfile - /.loadnonttfontfile /.loadfontfile load def -/.loadfontfile % <file> .loadfontfile - - { dup read pop 2 copy unread 0 eq - { % If this is a font at all, it's a TrueType font. - .loadttfont pop - } - { % Not a TrueType font. - .loadnonttfontfile - } - ifelse - } bind def +/.loadfontfile { + dup read pop 2 copy unread 0 eq { + % If this is a font at all, it's a TrueType font. + .loadttfont pop + } { + % Not a TrueType font. + .loadnonttfontfile + } ifelse +} bind def % ---------------- Automatic Type 42 generation ---------------- % % Load a TrueType font from a file as a Type 42 PostScript font. % The thing that makes this really messy is the handling of encodings. -% There are 3 interacting tables that affect the encoding: +% There are 2 interacting tables that affect the encoding: % 'cmap' provides multiple maps from character codes to glyph indices -% 'glyf' maps glyph indices to outlines % 'post' maps glyph indices to glyph names (if present) % What we need to get out of this is: % Encoding mapping character codes to glyph names @@ -134,98 +130,94 @@ MacRomanEncoding 249 7 getinterval aload pop { ] readonly } ifelse def -% Procedures -/getu16 % <string> <index> getu16 <integer> - { 2 copy get 8 bitshift 3 1 roll 1 add get add - } bind def -/gets16 % <string> <index> gets16 <integer> - { getu16 16#8000 xor 16#8000 sub - } bind def -/getu32 % <string> <index> getu32 <integer> - { 2 copy getu16 16 bitshift 3 1 roll 2 add getu16 add - } bind def -/gets32 % <string> <index> gets32 <integer> - { getu32 dup 16#7fffffff gt { 4 { 16#40000000 sub } repeat } if - } bind def -/checkget { % <string|array> <index> checkget <element> - dup 0 lt 1 index 3 index length ge or { - (Malformed font \(?\)\n) print quit - } if get +% ---- Utilities ---- % + +% <string> <index> getu16 <integer> +/getu16 { + 2 copy get 8 bitshift 3 1 roll 1 add get add } bind def -/checkgetinterval { % <string> <offset> <length> checkgetinterval <substr> - 1 index 0 lt 1 index 0 lt or - 2 index 2 index add 4 index length gt or { - (Malformed font \(?\)\n) print quit - } if getinterval + +% <string> <index> gets16 <integer> +/gets16 { + getu16 16#8000 xor 16#8000 sub } bind def -/getrange { % <offset> <length> getrange <string> - % Free variables: sfnts - sfnts { - % Stack: offset length sfnt - dup length 3 index gt { exit } if - 3 -1 roll exch length sub exch - } forall - dup type /stringtype ne { () } if % fail if out of range - 3 1 roll checkgetinterval + +% <string> <index> getu32 <integer> +/getu32 { + 2 copy getu16 16 bitshift 3 1 roll 2 add getu16 add } bind def -/findtableentry % <name4> findtableentry <tableentry> true - % <name4> findtableentry false - % Free variables: tables - { false 0 16 tables length 16 sub - { % Stack: name4 false toffset - tables 1 index 4 getinterval 3 index eq - { tables exch 16 getinterval - exch pop exch true exit - } - if pop - } - for exch pop - } bind def -/findtable % <name4> findtable <table> true - % <name4> findtable false - % Free variables: tables - { findtableentry - { dup 8 getu32 exch 12 getu32 getrange true } - { false } - ifelse - } bind def -/findname % <nametable> <nameid> findname <string> true - % <nametable> <nameid> findname false - { false 3 1 roll 0 1 3 index 2 getu16 1 sub - { % Stack: false table id index - 12 mul 6 add 2 index exch 12 getinterval - dup 6 getu16 2 index eq - { % We found the name we want. - exch pop + +% <string> <index> gets32 <integer> +/gets32 { + 2 copy gets16 16 bitshift 3 1 roll 2 add getu16 add +} bind def + +% <string> <index> <integer> putu16 - +/putu16 { + 3 copy -8 bitshift put + exch 1 add exch 16#ff and put +} bind def + +% <string> <index> <integer> putu32 - +/putu32 { + 3 copy -16 bitshift putu16 + exch 2 add exch 16#ffff and putu16 +} bind def + +% <nametable> <nameid> findname <string> true +% <nametable> <nameid> findname false +/findname { + false 3 1 roll 0 1 3 index 2 getu16 1 sub { + % Stack: false table id index + 12 mul 6 add 2 index exch 12 getinterval + dup 6 getu16 2 index eq { + % We found the name we want. + exch pop % Stack: false table record - dup 10 getu16 2 index 4 getu16 add - 1 index 8 getu16 4 -1 roll 3 1 roll getinterval exch + dup 10 getu16 2 index 4 getu16 add + 1 index 8 getu16 4 -1 roll 3 1 roll getinterval exch % Stack: false string record % Check for 8- vs. 16-bit characters. - is2byte { string2to1 } if true null 4 -1 roll exit - } - if pop - } - for pop pop - } bind def -/is2byte % <namerecord> is2byte <bool> - { dup 0 getu16 - { { pop true } % Apple Unicode - { pop false } % Macintosh Script manager - { 1 getu16 1 eq } % ISO - { 1 getu16 1 eq } % Microsoft - } - exch get exec - } bind def -/string2to1 % <string2> string2to1 <string> - { dup length 2 idiv string dup - 0 1 3 index length 1 sub - { 3 index 1 index 2 mul 1 add get put dup } - for pop exch pop - } bind def + is2byte { string2to1 } if true null 4 -1 roll exit + } if pop + } for pop pop +} bind def + +% <namerecord> is2byte <bool> +/is2byte { + dup 0 getu16 { + { pop true } % Apple Unicode + { pop false } % Macintosh Script manager + { 1 getu16 1 eq } % ISO + { 1 getu16 1 eq } % Microsoft + } exch get exec +} bind def + +% <string2> string2to1 <string> +/string2to1 { + dup length 2 idiv string dup + 0 1 3 index length 1 sub { + 3 index 1 index 2 mul 1 add get put dup + } for pop exch pop +} bind def + +% <array> <lt-proc> sort <array> +/sort { + 1 index length 1 sub -1 1 { + 2 index exch 2 copy get 3 copy % arr proc arr i arr[i] arr i arr[i] + 0 1 3 index 1 sub { + 3 index 1 index get % arr proc arr i arr[i] arr imax amax j arr[j] + 2 index 1 index 10 index exec { % ... amax < arr[j] + 4 2 roll + } if pop pop + } for % arr proc arr i arr[i] arr imax amax + 4 -1 roll exch 4 1 roll put put + } for pop +} def + +% Each procedure in this dictionary is called as follows: +% -mark- encodingtable <<proc>> -mark- glyphindices... /cmapformats mark - % Each procedure in this dictionary is called as follows: - % -mark- encodingtable <<proc>> -mark- glyphindices... 0 % Apple standard 1-to-1 mapping. { 6 256 getinterval { } forall } bind @@ -270,17 +262,20 @@ ifelse def for pop } bind .dicttomark readonly def % cmapformats -/cmaparray % <cmaptab> cmaparray -mark- <glyphs> ... - { mark exch dup 0 getu16 cmapformats exch .knownget - { exec } - { (Can't handle format ) print 0 getu16 = flush - 0 1 255 { } for - } - ifelse - } bind def + +% <cmaptab> cmaparray -mark- <glyphs> ... +/cmaparray { + mark exch dup 0 getu16 cmapformats exch .knownget { + exec + } { + (Can't handle format ) print 0 getu16 = flush + 0 1 255 { } for + } ifelse +} bind def + +% Each procedure in this dictionary is called as follows: +% posttable <<proc>> glyphencoding /postformats mark - % Each procedure in this dictionary is called as follows: - % posttable <<proc>> glyphencoding 16#00010000 { % 258 standard Macintosh glyphs. MacGlyphEncoding } @@ -296,7 +291,7 @@ ifelse def { 258 sub glyphnames exch { postglyphs 1 index get 1 add add } repeat - 1 add postglyphs exch 2 copy 1 sub checkget checkgetinterval cvn + 1 add postglyphs exch 2 copy 1 sub get getinterval cvn } ifelse } @@ -306,55 +301,163 @@ ifelse def pop [ ] } bind .dicttomark readonly def % postformats + +% Each procedure in this dictionary is called as follows: +% <file> <length> -proc- <string|array_of_strings> +/.readtable { + % Each table must have an even length, because of a strange + % Adobe requirement that each sfnts entry have even length. + dup dup 1 and add string + % Stack: f len str + dup 0 4 -1 roll getinterval + % Stack: f str str1 + 3 -1 roll exch readstring pop pop +} bind def +/readtables mark + % Ordinary tables + (cmap) { .readtable } + (head) 1 index + (hhea) 1 index + (hmtx) 1 index + (loca) 1 index + (name) 1 index + (post) 1 index + (vhea) 1 index + (vmtx) 1 index + % Special tables + (glyf) { .readglyfs } +.dicttomark readonly def % readtables + .dicttomark readonly def % .loadttfontdict -/.loadttfonttables % <file> .loadttfonttables - - % Pushes .loadttfontdict & scratch dict on d-stack, - % defines f, offsets, tables - { .loadttfontdict begin - 40 dict begin - /f exch def - /offsets f 12 string readstring pop def - /tables f offsets 4 getu16 16 mul string readstring pop def - } bind def -/.readsfnts0 { % <len0> .readsfnts0 <string> - dup string - dup 0 offsets putinterval - dup offsets length tables putinterval - dup offsets length tables length add - % Stack: len0 str str off+tab - 3 index 1 index sub getinterval - f exch dup length 0 ne { readstring } if pop pop - exch pop + +% <tab> .printtab - +/.printtab { + dup 0 4 getinterval print ( ) print + dup 8 getu32 =only ( ) print + 12 getu32 = } bind def -/.dividesfnts { % <length> .dividesfnts - - (glyf) findtableentry pop - dup 8 getu32 /len0 exch def - 12 getu32 - % If there is any data beyond the glyfs, round up the length - % of the glyfs to an even value. This is complete garbage, - % of course, but some TrueType fonts seem to be formatted - % this way (with an odd glyfs length and an unaccounted-for - % pad byte immediately following). - dup 1 and add - /len1 exch def - len0 len1 add sub /len2 exch def - /sfnts [ - % First approximation of sfnts; string boundaries will be - % moved to coincide with glyph boundaries. - len0 .readsfnts0 - len1 { + +% <file> .loadttfonttables - +% Pushes .loadttfontdict & scratch dict on d-stack. +% Defines f, offsets, tables, tabdict, tabs. +/.loadttfonttables { + .loadttfontdict begin + 40 dict begin + /f exch def + /offsets f 12 string readstring pop def + /tables f offsets 4 getu16 16 mul string readstring pop def + /tabdict tables length 16 idiv dict def + % tabs = tables we want to keep, sorted by file position. + /tabs [ 0 16 tables length 1 sub { + tables exch 16 getinterval + DEBUG { dup .printtab } if + dup 0 4 getinterval readtables 1 index known { + tabdict exch 2 index put + } { + pop pop + } ifelse + } for ] { + exch 8 getu32 exch 8 getu32 lt + } sort def +} bind def + +% <file> <length> .readglyfs <strings> +% Read the glyfs data. This is special because glyfs may exceed 64K. +/.readglyfs { + dup 65400 lt { + .readtable + } { + [ 3 1 roll { + % Stack: mark ... f left dup maxstring le { exit } if - f maxstring string readstring pop - exch maxstring sub - } loop - string f exch readstring pop - len2 0 eq { 0 string } { f len2 string readstring pop } ifelse + 1 index maxstring string readstring pop 3 1 roll maxstring sub + } loop .readtable ] + } ifelse +} bind def + +% - .readttdata - +% Read data. Updates offsets, tabs; stores data in tabdict. +/.readttdata { + /fpos offsets length tables length add def + /sfpos offsets length tabs length 16 mul add def + offsets 4 tabs length putu16 + tabs { + dup 0 4 getinterval /tname exch def + dup 8 getu32 /tpos exch def + dup 12 getu32 /tlen exch def + 8 sfpos putu32 + % Skip data between the end of the previous table and + % the beginning of this one, if any. + tpos fpos gt { + f tpos fpos sub () /SubFileDecode filter dup flushfile closefile + /fpos tpos def + } if + f tlen readtables tname get exec + tabdict tname 3 -1 roll put + /fpos fpos tlen add def + % Round up the table length to an even value. + /sfpos sfpos tlen dup 1 and add add def + } forall +} bind def + +% - .makesfnts - +% Defines checksum, getloca, head, locatable, numglyphs, post, sfnts, upem +/.makesfnts { + .readttdata + /head tabdict /head get def + /checksum head 8 getu32 def + /locatable tabdict /loca get def + /numglyphs locatable length /getloca + /post tabdict /post .knownget not { null } if def + head 50 getu16 0 ne { + { + 2 bitshift locatable exch getu32 + } def 4 + } { + { + dup add locatable exch getu16 dup add + } def 2 + } ifelse idiv 1 sub def + % If necessary, re-partition the glyfs. + tabdict /glyf get dup type /stringtype ne { + .dividesfnts tabdict /glyf 3 -1 roll put + } { + pop + } ifelse + /sfnts [ + offsets tabs { concatstrings } forall + tabs { + 0 4 getinterval tabdict exch get + dup type /stringtype ne { aload pop } if + } forall ] def - .setloca - len1 maxstring gt { +} bind def + +% - .getcmap - +% Defines cmapsub, cmaptab +/.getcmap { + tabdict /cmap get + % The Apple cmap format is no help in determining the encoding. + % Look for a Microsoft table. If we can't find one, + % just use the first table, whatever it is. + dup 4 8 getinterval exch % the default + 0 1 2 index 2 getu16 1 sub + { 8 mul 4 add 1 index exch 8 getinterval + dup 0 getu16 3 eq { exch 3 -1 roll pop exit } if pop + } + for + % Stack: subentry table + /cmapsub 2 index def + exch 4 getu32 1 index length 1 index sub getinterval + /cmaptab exch def +} bind def + +% <glyfs> .dividesfnts <glyfs'> +/.dividesfnts { + /glyfs exch def + /len1 0 glyfs { length add } forall def % Determine where to split the glyfs by scanning loca. % The very last entry in loca may be bogus. - % What a nuisance! % % Construct splitarray, the array of final lengths of % the sfnts entries covering the glyfs (i.e., all but @@ -362,14 +465,8 @@ ifelse def /prevsplit 0 def /prevboundary 0 def /splitarray [ - loca32 { % 32-bit loca - /getloca { getu32 } def - 0 4 locatable length 8 sub - } { % 16-bit loca - /getloca { getu16 1 bitshift } def - 0 2 locatable length 4 sub - } ifelse { - locatable exch getloca dup prevsplit maxstring add gt { + 0 1 numglyphs 1 sub { + getloca dup prevsplit maxstring add gt { prevboundary prevsplit sub exch /prevsplit prevboundary def } if @@ -377,12 +474,11 @@ ifelse def } for len1 prevsplit sub ] def - /sfnts [ + [ % Re-split the sfnts glyfs strings according to splitarray. - sfnts 0 get % everything before glyfs - sfnts 1 get + glyfs 0 get /split_idx 0 def - /sfnt_idx 2 def { + /sfnt_idx 1 def { % Stack: [ ...strings... current_string dup length splitarray split_idx get ge { % The next split falls within the current string. @@ -390,7 +486,7 @@ ifelse def 1 index length dup 2 index length exch sub getinterval split_idx splitarray length 1 sub lt { /split_idx split_idx 1 add def - }{ + } { length 0 ne { (Shouldn't happen1 -- malformed splitarray\n) print quit } if @@ -399,72 +495,59 @@ ifelse def } { % The next split falls beyond the current string. % Concatenate another sfnts string onto the current one. - sfnt_idx sfnts length 1 sub lt { - sfnts sfnt_idx get concatstrings + sfnt_idx glyfs length lt { + glyfs sfnt_idx get concatstrings /sfnt_idx sfnt_idx 1 add def } { (Shouldn't happen2 -- malformed splitarray\n) print quit } ifelse } ifelse } loop - sfnts dup length 1 sub get % everything after glyfs - ] def - } if + ] } bind def -/.setloca { % - .setloca - - /head (head) findtable pop def - /locatable (loca) findtable pop def - /loca32 head 50 getu16 0 ne def + +% - .ttkeys <key> <value> ... +/.ttkeys { + /upem head 18 getu16 def + /FontMatrix matrix + /FontBBox [ 36 2 42 { head exch gets16 upem div } for ] + tabdict /name .knownget { + % Find the names from the 'name' table. + /names exch def + /FontName names 6 findname not { checksum 16 8 string cvrs } if + /fontname 1 index def + /FontInfo mark + names 0 findname { /Notice exch } if + names 1 findname { /FamilyName exch } if + names 4 findname { /FullName exch } if + names 5 findname { /Version exch } if + } { + % No name table, fabricate a FontName. + /FontName checksum 16 8 string cvrs + /fontname 1 index def + /FontInfo mark + } ifelse + % Stack: ... /FontInfo mark key1 value1 ... + post null ne { + /ItalicAngle post 4 gets32 65536.0 div + /isFixedPitch post 12 getu32 0 ne + /UnderlinePosition post 8 gets16 upem div + /UnderlineThickness post 10 gets16 upem div + } if + counttomark 0 ne { .dicttomark } { pop pop } ifelse + /XUID [orgXUID 42 checksum] + /sfnts sfnts + DEBUG { + tabs { .printtab } forall + [ sfnts { length } forall ] == + } if } bind def -/.makesfnts % - .makesfnts - - % Defines head, sfnts - { % Find the end of the last table, and also the end of - % the last table below the 64K mark. - 0 8 16 tables length - { % Stack: end toffset - DEBUG - { tables 1 index 8 sub 4 getinterval print ( ) print - tables 1 index getu32 =only ( ) print - tables 1 index 4 add getu32 = - } - if - tables 1 index getu32 exch tables exch 4 add getu32 add max - } - for - dup maxstring le { - .readsfnts0 - % Pad to even length if necessary, per Adobe specification. - dup length 2 mod 0 ne { - <00> concatstrings - } if - 1 array astore /sfnts exch def - .setloca - } { - % If the total length exceeds maxstring, divide the data - % into 2+n strings: before glyf, glyfs, after glyf - .dividesfnts - } ifelse - } bind def -/.loadttfont % <file> .loadttfont <type42font> - { .loadttfonttables - .makesfnts - /upem head 18 getu16 def - (cmap) findtable pop - % The Apple cmap format is no help in determining the encoding. - % Look for a Microsoft table. If we can't find one, - % just use the first table, whatever it is. - dup 4 8 getinterval exch % the default - 0 1 2 index 2 getu16 1 sub - { 8 mul 4 add 1 index exch 8 getinterval - dup 0 getu16 3 eq { exch 3 -1 roll pop exit } if pop - } - for - % Stack: subentry table - /cmapsub 2 index def - exch 4 getu32 1 index length 1 index sub getinterval - /cmaptab exch def + +% -mark- <key> <value> ... .definettfont <font> +/.definettfont { + /FontType 42 + /PaintType 0 % See if we have PostScript glyph name information. - /post (post) findtable not { null } if def /glyphencoding post null eq { [ ] } { @@ -472,67 +555,79 @@ ifelse def } ifelse % If necessary, fabricate additional glyphencoding entries % to cover all of loca. - /numglyphs locatable length loca32 { 4 } { 2 } ifelse idiv 1 sub def dup length numglyphs lt { [ exch aload pop counttomark 1 numglyphs 1 sub { =string cvs (_) exch concatstrings cvn } for ] } if def - /checksum head 8 getu32 def - mark - /FontType 42 - /FontMatrix matrix - /PaintType 0 - /FontBBox [ 36 2 42 { head exch gets16 upem div } for ] - (name) findtable - { % Find the names from the 'name' table. - /names exch def - /FontName names 6 findname not { checksum 16 8 string cvrs } if - /FontInfo mark - names 0 findname { /Notice exch } if - names 1 findname { /FamilyName exch } if - names 4 findname { /FullName exch } if - names 5 findname { /Version exch } if - } - { % No name table, fabricate a FontName. - /FontName checksum 16 8 string cvrs - /FontInfo mark - } - ifelse - % Stack: /FontInfo mark key1 value1 ... - post null ne - { /ItalicAngle post 4 gets32 65536.0 div - /isFixedPitch post 12 getu32 0 ne - /UnderlinePosition post 8 gets16 upem div - /UnderlineThickness post 10 gets16 upem div - } - if - counttomark 0 ne - { .dicttomark } - { pop pop } - ifelse - /Encoding - cmaptab cmaparray - counttomark array astore - { glyphencoding exch get } forall - counttomark 256 sub dup 0 ge - { { pop } repeat } - { neg { /.notdef } repeat } - ifelse ] + /Encoding + cmaptab cmaparray + counttomark array astore + { glyphencoding exch get } forall + counttomark 256 sub dup 0 ge { + { pop } repeat + } { neg { /.notdef } repeat + } ifelse ] % Until we can compute the MD5 fingerprint, % just use the precomputed checksum. - /XUID [orgXUID 42 checksum] - /CharStrings glyphencoding dup length dict - 0 1 3 index length 1 sub - { % Stack: glyphencoding dict index - 2 index 1 index get 2 index 1 index known - { pop pop } - { 2 index exch 3 -1 roll put } - ifelse - } - for exch pop readonly - /sfnts sfnts - .dicttomark - end end dup /FontName get exch definefont - } bind def + /CharStrings glyphencoding dup length dict + 0 1 3 index length 1 sub { + % Stack: glyphencoding dict index + 2 index 1 index get 2 index 1 index known { + pop pop + } { + 2 index exch 3 -1 roll put + } ifelse + } for exch pop readonly + .dicttomark + end end dup /FontName get exch definefont +} bind def + +% -mark- <key> <value> ... .definettcidfont <font> +/.definettcidfont { + /CIDFontName fontname + /CIDFontType 2 + /CIDSystemInfo mark + /Registry (Adobe) + /Ordering (Japan1) % adhoc + /Supplement 0 + .dicttomark + /CharStrings mark /.notdef 0 .dicttomark + cmaptab cmaparray + counttomark /cidcount exch def + % This algorithm only works up to 32K character codes. + % We'll extend it later if we need to. + cidcount 2 mul string + 0 1 cidcount 1 sub { + 2 copy dup 2 mul exch + % Stack: mark gid0 ... cidmap i cidmap 2*i i + cidcount 3 add exch sub index putu16 pop + } for + counttomark 1 add 1 roll cleartomark + /CIDMap exch + /CIDCount cidcount + /GDBytes 2 + .dicttomark + end end dup /CIDFontName get exch /CIDFont defineresource +} bind def + +% <file> .loadttfont <type42font> +/.loadttfont { + .loadttfonttables + .makesfnts + .getcmap + mark + .ttkeys + .definettfont +} bind def + +% <file> .loadttcidfont <cidtype2font> +/.loadttcidfont { + .loadttfonttables + .makesfnts + .getcmap + mark + .ttkeys + .definettcidfont +} bind def diff --git a/gs/lib/pdf_font.ps b/gs/lib/pdf_font.ps index fbc09be51..00c25907d 100644 --- a/gs/lib/pdf_font.ps +++ b/gs/lib/pdf_font.ps @@ -482,16 +482,17 @@ readonly def } bdef % Apply the [D]W[2] metrics to a character before displaying. -/CIDWProc { % <font> <w0x> <w0y> <llx> <lly> <urx> <ury> - % <w1x> <w1y> <vx> <vy> <cid> CIDWproc +/CIDWProc { % <w0x> <w0y> <llx> <lly> <urx> <ury> + % <w1x> <w1y> <vx> <vy> <cid> <font> CIDWproc % <w0x'> ... <vy'> - 12 -1 roll begin + begin % Look up and apply [D]W 10 index - currentdict /DW .knownget { exch pop } if + currentdict /DW .knownget { 1000 div exch pop } if currentdict /W .knownget { % Search the W array for the CID. % ****** NOT IMPLEMENTED YET ****** + pop } if 0 13 2 roll 11 -2 roll pop pop % Look up and apply [D]W2 diff --git a/gs/make.txt b/gs/make.txt index b4ac5e292..3a1fd93b5 100644 --- a/gs/make.txt +++ b/gs/make.txt @@ -90,22 +90,18 @@ Third-party libraries --------------------- You need the source code for the Independent JPEG Group (IJG) library, the -PNG library, and the zlib library in order to build Ghostscript. The -authoritative distribution points for these libraries are, respectively: - - IJG library: - ftp.uu.net:/graphics/jpeg/jpegsrc.v##.tar.gz - ftp.simtel.net:/pub/simtelnet/msdos/graphics/jpegsr##.zip - PNG library: - ftp://swrinde.nde.swri.edu/pub/png/src/ - libpng-#.##.tar.gz - lpng###.zip (or possibly lbpng###.zip or lp###.zip) - zlib library: - ftp://ftp.uu.net/pub/archiving/zip/zlib/ - zlib-#.#.#.tar.gz - zlib###.zip - -Get the .zip files if you are building on MS-DOS or MS Windows, the .tar.gz +PNG library, and the zlib library in order to build Ghostscript. Please +consult the following other files to find the authoritative distribution +points for these libraries: + + IJG library: see jpeg.mak + + PNG library: see libpng.mak + + zlib library: see zlib.mak + +The FTP sites have both .zip and .tar.gz archives of the source code. Get +the .zip files if you are building on MS-DOS or MS Windows, the .tar.gz files for all other environments. Note that each of these libraries has its own version numbers that have nothing to do with Ghostscript version numbers; you should get the highest numbered version. (You may have to go @@ -29,6 +29,63 @@ Procedures, Utilities, Drivers, Platforms, Fonts, Interpreter, Streams (included under Interpreter through release 2.9.9), Library. Changes marked with a * were made available as patches to a previous release. +Version 5.35(beta) (8/18/98) +============================ + +More updates for 5.3x, specifically fixing problems with halftones on banded +CMYK devices. + +Documentation +------------- + +Fixes problems: + - The URLs for the third-party libraries were out of date. +(make.txt, jpeg.mak, libpng.mak, zlib.mak) + +Drivers +------- + +Adds an x11gray4 device for help in debugging. (devs.mak, gdevxalt.c) + +Fonts +----- + +Fixes problems: + - TrueType fonts with more than 64K of data before or after the +glyfs caused an error. (gs_ttf.ps) + +Interpreter +----------- + +Fixes problems: + - The dictionary returned by currentuserparams was allocated in the +current VM rather than always in local VM. (gs_lev2.ps) + +Interpreter (PDF) +----------------- + +Fixes problems: + - CID-keyed fonts caused an error, because their CDevProc was +incorrect. (pdf_font.ps) + +Library +------- + +Fixes problems: + - A comment was duplicated. (gxht.h) + - The main procedure of the command list reader was so large that it +couldn't be optimized by many compilers, and was very hard to read. +(gxclrast.c) + - Banding devices using multi-screen halftones could get memory +access errors because they didn't clear the halftone caches when changing +halftone parameters. (gxclrast.c) + - Banding devices using multi-screen halftones didn't set the +halftone phase correctly. (gxcht.c, gxclrast.c) + - RasterOp didn't work for 2- or 4-bit gray-scale devices. It still +doesn't work right, but it's closer. (gdevm2.c, gdevm4.c, gdevmrop.c) + - Undefined characters in CMap-based composite fonts caused errors +and possible invalid memory accesses. (gschar0.c) + Version 5.34(beta) (8/16/98) ============================ diff --git a/gs/public.txt b/gs/public.txt index 1698e9007..0c574bd34 100644 --- a/gs/public.txt +++ b/gs/public.txt @@ -2,7 +2,7 @@ This file is part of Aladdin Ghostscript. - Aladdin Ghostscript is distributed with NO WARRALTY OF ANY KIND. No author + Aladdin Ghostscript is distributed with NO WARRANTY OF ANY KIND. No author or distributor accepts any responsibility for the consequences of using it, or for whether it serves any particular purpose or works at all, unless he or she says so in writing. Refer to the Aladdin Ghostscript Free Public diff --git a/gs/src/ansi2knr.c b/gs/src/ansi2knr.c index 88ef52363..9456e3127 100644 --- a/gs/src/ansi2knr.c +++ b/gs/src/ansi2knr.c @@ -1,6 +1,6 @@ /* Copyright (C) 1989, 1997 Aladdin Enterprises. All rights reserved. */ -/*$Id$*/ + /* Convert ANSI C function definitions to K&R ("traditional C") syntax */ /* diff --git a/gs/src/bench.c b/gs/src/bench.c index 22b95b920..dd1c1e935 100644 --- a/gs/src/bench.c +++ b/gs/src/bench.c @@ -17,7 +17,7 @@ all copies. */ -/*$Id$ */ + /* Simple hardware benchmarking suite (C and PostScript) */ #include <stdio.h> #include <stdlib.h> diff --git a/gs/src/bfont.h b/gs/src/bfont.h index d3bbf79bb..82eeb2549 100644 --- a/gs/src/bfont.h +++ b/gs/src/bfont.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interpreter internal routines and data needed for building fonts */ /* Requires gxfont.h */ diff --git a/gs/src/btoken.h b/gs/src/btoken.h index ffcbca1a4..ea2faba74 100644 --- a/gs/src/btoken.h +++ b/gs/src/btoken.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for Level 2 binary tokens */ #ifndef btoken_INCLUDED diff --git a/gs/src/ccfont.h b/gs/src/ccfont.h index eb1618e11..e852a3558 100644 --- a/gs/src/ccfont.h +++ b/gs/src/ccfont.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Header for fonts compiled into C. */ #ifndef ccfont_INCLUDED diff --git a/gs/src/ctype_.h b/gs/src/ctype_.h index b3ab037ce..b6467bf12 100644 --- a/gs/src/ctype_.h +++ b/gs/src/ctype_.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Wrapper for ctype.h */ #ifndef ctype__INCLUDED diff --git a/gs/src/devs.mak b/gs/src/devs.mak index 108b204d9..2f11f6fa2 100644 --- a/gs/src/devs.mak +++ b/gs/src/devs.mak @@ -80,6 +80,7 @@ GDEV=$(AK) $(ECHOGS_XE) $(GDEVH) # x11alpha X Windows masquerading as a device with alpha capability # x11cmyk X Windows masquerading as a 1-bit-per-plane CMYK device # x11gray2 X Windows as a 2-bit gray-scale device +# x11gray4 X Windows as a 4-bit gray-scale device # x11mono X Windows masquerading as a black-and-white device # Printers: # + deskjet H-P DeskJet and DeskJet Plus @@ -384,6 +385,7 @@ $(GLOBJ)gdevxxf.$(OBJ): $(GLSRC)gdevxxf.c $(GDEVX) $(math__h) $(memory__h)\ # x11alpha pretends to have 4 bits of alpha channel. # x11cmyk pretends to be a CMYK device with 1 bit each of C,M,Y,K. # x11gray2 pretends to be a 2-bit gray-scale device. +# x11gray4 pretends to be a 4-bit gray-scale device. # x11mono pretends to be a black-and-white device. x11alt_=$(x11_) $(GLOBJ)gdevxalt.$(OBJ) x11alpha.dev: $(x11alt_) @@ -398,6 +400,10 @@ x11gray2.dev: $(x11alt_) $(SETDEV2) x11gray2 $(x11alt_) $(ADDMOD) x11gray2 -lib $(XLIBS) +x11gray4.dev: $(x11alt_) + $(SETDEV2) x11gray4 $(x11alt_) + $(ADDMOD) x11gray4 -lib $(XLIBS) + x11mono.dev: $(x11alt_) $(SETDEV2) x11mono $(x11alt_) $(ADDMOD) x11mono -lib $(XLIBS) diff --git a/gs/src/dirent_.h b/gs/src/dirent_.h index 2ba1c7c3e..423d3ee2c 100644 --- a/gs/src/dirent_.h +++ b/gs/src/dirent_.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic substitute for Unix dirent.h */ #ifndef dirent__INCLUDED diff --git a/gs/src/dos_.h b/gs/src/dos_.h index 5b090155b..872bfb8e6 100644 --- a/gs/src/dos_.h +++ b/gs/src/dos_.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic MS-DOS interface */ #ifndef dos__INCLUDED diff --git a/gs/src/dpmainc.c b/gs/src/dpmainc.c index 1bdcaa8d8..117062e93 100644 --- a/gs/src/dpmainc.c +++ b/gs/src/dpmainc.c @@ -17,7 +17,7 @@ */ -/*$Id$ */ + /* Ghostscript DLL loader for OS/2 */ /* For WINDOWCOMPAT (console mode) application */ diff --git a/gs/src/dstack.h b/gs/src/dstack.h index a561804c7..194642aec 100644 --- a/gs/src/dstack.h +++ b/gs/src/dstack.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for the interpreter's dictionary stack */ #ifndef dstack_INCLUDED diff --git a/gs/src/dwmain.rc b/gs/src/dwmain.rc index 16cb5a07c..f4ff42d94 100644 --- a/gs/src/dwmain.rc +++ b/gs/src/dwmain.rc @@ -17,7 +17,7 @@ */ -/*$Id$*/ + #include <windows.h> #include "dwmain.h" diff --git a/gs/src/echogs.c b/gs/src/echogs.c index 464288188..e6c4e136c 100644 --- a/gs/src/echogs.c +++ b/gs/src/echogs.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* 'echo'-like utility */ #include <stdio.h> /* Some brain-damaged environments (e.g. Sun) don't include */ diff --git a/gs/src/errno_.h b/gs/src/errno_.h index 3e9ee8a11..2da5b9d73 100644 --- a/gs/src/errno_.h +++ b/gs/src/errno_.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic substitute for Unix errno.h */ #ifndef errno__INCLUDED diff --git a/gs/src/errors.h b/gs/src/errors.h index 062c65061..5b5152472 100644 --- a/gs/src/errors.h +++ b/gs/src/errors.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definition of error codes */ #ifndef errors_INCLUDED diff --git a/gs/src/estack.h b/gs/src/estack.h index 76c3ec8d7..d28c44cdf 100644 --- a/gs/src/estack.h +++ b/gs/src/estack.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for the execution stack */ #ifndef estack_INCLUDED diff --git a/gs/src/files.h b/gs/src/files.h index 128609d54..9106ef007 100644 --- a/gs/src/files.h +++ b/gs/src/files.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires stream.h */ #ifndef files_INCLUDED diff --git a/gs/src/fname.h b/gs/src/fname.h index 8bf0f15fc..8e3a8e735 100644 --- a/gs/src/fname.h +++ b/gs/src/fname.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gxiodev.h */ #ifndef fname_INCLUDED diff --git a/gs/src/gconf.c b/gs/src/gconf.c index a929be282..e39305cdc 100644 --- a/gs/src/gconf.c +++ b/gs/src/gconf.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Configuration tables */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gconf.h b/gs/src/gconf.h index bd02d5557..457e902ea 100644 --- a/gs/src/gconf.h +++ b/gs/src/gconf.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Wrapper for gconfig.h or a substitute. */ /* diff --git a/gs/src/gdebug.h b/gs/src/gdebug.h index bf6f02e33..017aee976 100644 --- a/gs/src/gdebug.h +++ b/gs/src/gdebug.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Debugging machinery definitions */ #ifndef gdebug_INCLUDED diff --git a/gs/src/gdev3852.c b/gs/src/gdev3852.c index 435318da4..70af0431d 100644 --- a/gs/src/gdev3852.c +++ b/gs/src/gdev3852.c @@ -24,7 +24,7 @@ Modified 3/93 to dimension page back to 8.5, which seems to the full printing width of the printer. It was modeled after the V2.4.1 HP Paintjet driver (gdevpjet.c) */ -/*$Id$*/ + /* IBM 3852 JetPrinter color ink jet driver for Ghostscript */ #include "gdevprn.h" diff --git a/gs/src/gdev3b1.c b/gs/src/gdev3b1.c index 74368ff41..54e26d169 100644 --- a/gs/src/gdev3b1.c +++ b/gs/src/gdev3b1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* * This is a driver for the AT&T 3b1/7300/UnixPC console display. * diff --git a/gs/src/gdev4081.c b/gs/src/gdev4081.c index fb99de61a..c29d14083 100644 --- a/gs/src/gdev4081.c +++ b/gs/src/gdev4081.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Ricoh 4081 laser printer driver */ #include "gdevprn.h" diff --git a/gs/src/gdev4693.c b/gs/src/gdev4693.c index fff03ffa3..1f1d511c1 100644 --- a/gs/src/gdev4693.c +++ b/gs/src/gdev4693.c @@ -6,7 +6,7 @@ * This software is provided "as is" without express or implied warranty. */ -/*$Id$*/ + /* Driver for the Tektronix 4693d color plotter. */ #include "gdevprn.h" #define prn_dev ((gx_device_printer *)dev) /* needed in 5.31 et seq */ diff --git a/gs/src/gdev8510.c b/gs/src/gdev8510.c index 303667c93..05fc49894 100644 --- a/gs/src/gdev8510.c +++ b/gs/src/gdev8510.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* * C.Itoh M8510 printer driver for ghostscript. * by Bob Smith <bob@snuffy.penfield.ny.us> diff --git a/gs/src/gdev8bcm.c b/gs/src/gdev8bcm.c index c000ba978..34b1cd7ca 100644 --- a/gs/src/gdev8bcm.c +++ b/gs/src/gdev8bcm.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Dynamic color mapping for 8-bit displays */ #include "gx.h" #include "gxdevice.h" diff --git a/gs/src/gdev8bcm.h b/gs/src/gdev8bcm.h index 5335a347e..cbc9cfe9c 100644 --- a/gs/src/gdev8bcm.h +++ b/gs/src/gdev8bcm.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gxdevice.h (for gx_color_value) */ #ifndef gdev8bcm_INCLUDED diff --git a/gs/src/gdevabuf.c b/gs/src/gdevabuf.c index fe1c57d26..4d9d97bce 100644 --- a/gs/src/gdevabuf.c +++ b/gs/src/gdevabuf.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Alpha-buffering memory devices */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gdevadmp.c b/gs/src/gdevadmp.c index 8e1e8e33b..a7509ad9e 100644 --- a/gs/src/gdevadmp.c +++ b/gs/src/gdevadmp.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* * This is a modification of Mark Wedel's Apple DMP and * Jonathan Luckey's Imagewriter II driver to diff --git a/gs/src/gdevalph.c b/gs/src/gdevalph.c index 538d99f07..034c244d5 100644 --- a/gs/src/gdevalph.c +++ b/gs/src/gdevalph.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Alpha-channel storage device */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gdevbbox.c b/gs/src/gdevbbox.c index 0a00ede1a..c8b961e10 100644 --- a/gs/src/gdevbbox.c +++ b/gs/src/gdevbbox.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Device for tracking bounding box */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/gdevbbox.h b/gs/src/gdevbbox.h index f3a65c024..469089435 100644 --- a/gs/src/gdevbbox.h +++ b/gs/src/gdevbbox.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gxdevice.h */ #ifndef gdevbbox_INCLUDED diff --git a/gs/src/gdevbit.c b/gs/src/gdevbit.c index 92f9fcede..cbee2f769 100644 --- a/gs/src/gdevbit.c +++ b/gs/src/gdevbit.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* "Plain bits" devices to measure rendering time. */ #include "gdevprn.h" #include "gsparam.h" diff --git a/gs/src/gdevbj10.c b/gs/src/gdevbj10.c index 0ebe9b85a..0e465cf65 100644 --- a/gs/src/gdevbj10.c +++ b/gs/src/gdevbj10.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Canon Bubble Jet BJ-10e and BJ200 printer driver */ #include "gdevprn.h" diff --git a/gs/src/gdevbjc.h b/gs/src/gdevbjc.h index f0c10391d..515bb3f67 100644 --- a/gs/src/gdevbjc.h +++ b/gs/src/gdevbjc.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + #ifndef gdevbjc_INCLUDED # define gdevbjc_INCLUDED diff --git a/gs/src/gdevbmp.c b/gs/src/gdevbmp.c index dafc141a0..91d90ea3b 100644 --- a/gs/src/gdevbmp.c +++ b/gs/src/gdevbmp.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* .BMP file format output drivers */ #include "gdevprn.h" #include "gdevpccm.h" diff --git a/gs/src/gdevbmp.h b/gs/src/gdevbmp.h index a0d8fdb27..4bcba54c3 100644 --- a/gs/src/gdevbmp.h +++ b/gs/src/gdevbmp.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* .BMP file format definitions and utility interfaces */ #ifndef gdevbmp_INCLUDED diff --git a/gs/src/gdevbmpa.c b/gs/src/gdevbmpa.c index 86655e3a2..fe9dcf7f4 100644 --- a/gs/src/gdevbmpa.c +++ b/gs/src/gdevbmpa.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* .BMP file format output drivers: Demo of ASYNC rendering */ /* Initial version 2/2/98 by John Desrosiers (soho@crl.com) */ diff --git a/gs/src/gdevbmpc.c b/gs/src/gdevbmpc.c index 8ade1a61c..7e287836c 100644 --- a/gs/src/gdevbmpc.c +++ b/gs/src/gdevbmpc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* .BMP file format driver utilities */ #include "gdevprn.h" #include "gdevbmp.h" diff --git a/gs/src/gdevccr.c b/gs/src/gdevccr.c index bc543846a..01a294efc 100644 --- a/gs/src/gdevccr.c +++ b/gs/src/gdevccr.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* CalComp Raster Format driver */ #include "gdevprn.h" diff --git a/gs/src/gdevcdj.c b/gs/src/gdevcdj.c index befd2ef6d..f58315372 100644 --- a/gs/src/gdevcdj.c +++ b/gs/src/gdevcdj.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* H-P and Canon colour printer drivers */ /**************************************************************** diff --git a/gs/src/gdevcgm.c b/gs/src/gdevcgm.c index e4d3cf4a9..86df6b480 100644 --- a/gs/src/gdevcgm.c +++ b/gs/src/gdevcgm.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* CGM (Computer Graphics Metafile) driver */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gdevcgml.c b/gs/src/gdevcgml.c index 3bb8213e9..0c16e44b1 100644 --- a/gs/src/gdevcgml.c +++ b/gs/src/gdevcgml.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* CGM-writing library */ #include "memory_.h" #include "stdio_.h" diff --git a/gs/src/gdevcgml.h b/gs/src/gdevcgml.h index 7b3d66deb..cc3184e6b 100644 --- a/gs/src/gdevcgml.h +++ b/gs/src/gdevcgml.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface definitions for CGM-writing library */ #ifndef gdevcgml_INCLUDED diff --git a/gs/src/gdevcgmx.h b/gs/src/gdevcgmx.h index c81559b02..bdabc6ffa 100644 --- a/gs/src/gdevcgmx.h +++ b/gs/src/gdevcgmx.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal definitions for CGM-writing library */ #ifndef gdevcgmx_INCLUDED diff --git a/gs/src/gdevcif.c b/gs/src/gdevcif.c index e406d3bf8..baa21ff2d 100644 --- a/gs/src/gdevcif.c +++ b/gs/src/gdevcif.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* The `Fake bitmapped device to estimate rendering time' slightly modified to produce CIF files from PostScript. So anyone can put a nice logo free on its chip! diff --git a/gs/src/gdevcmap.c b/gs/src/gdevcmap.c index 7cf3e819f..d4267fb18 100644 --- a/gs/src/gdevcmap.c +++ b/gs/src/gdevcmap.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Special color mapping device */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gdevcmap.h b/gs/src/gdevcmap.h index 27fa9c6e9..348e35b16 100644 --- a/gs/src/gdevcmap.h +++ b/gs/src/gdevcmap.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to special color mapping device */ #ifndef gdevcmap_INCLUDED diff --git a/gs/src/gdevcp50.c b/gs/src/gdevcp50.c index 00472b603..72e564ff5 100644 --- a/gs/src/gdevcp50.c +++ b/gs/src/gdevcp50.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Mitsubishi CP50 color printer driver */ #include "gdevprn.h" #define ppdev ((gx_device_printer *)pdev) diff --git a/gs/src/gdevdbit.c b/gs/src/gdevdbit.c index 3e5fcafc3..a330ff8ad 100644 --- a/gs/src/gdevdbit.c +++ b/gs/src/gdevdbit.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Default device bitmap copying implementation */ #include "gx.h" #include "gpcheck.h" diff --git a/gs/src/gdevddrw.c b/gs/src/gdevddrw.c index 60a97fc5b..aed8e6754 100644 --- a/gs/src/gdevddrw.c +++ b/gs/src/gdevddrw.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Default polygon and image drawing device procedures */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/gdevdfax.c b/gs/src/gdevdfax.c index d13aa250a..993db1d50 100644 --- a/gs/src/gdevdfax.c +++ b/gs/src/gdevdfax.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* DigiBoard fax device. */ /*** *** Note: this driver is maintained by a user: please contact diff --git a/gs/src/gdevdflt.c b/gs/src/gdevdflt.c index fef2ffbe3..da91e36d7 100644 --- a/gs/src/gdevdflt.c +++ b/gs/src/gdevdflt.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Default device implementation */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gdevdgbr.c b/gs/src/gdevdgbr.c index abfcd1b59..4ff3f4bef 100644 --- a/gs/src/gdevdgbr.c +++ b/gs/src/gdevdgbr.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Default implementation of device get_bits[_rectangle] */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gdevdjet.c b/gs/src/gdevdjet.c index bf2ec9ec4..e91522822 100644 --- a/gs/src/gdevdjet.c +++ b/gs/src/gdevdjet.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* HP LaserJet/DeskJet driver for Ghostscript */ #include "gdevprn.h" #include "gdevpcl.h" diff --git a/gs/src/gdevdjtc.c b/gs/src/gdevdjtc.c index d4c7db88a..77892b209 100644 --- a/gs/src/gdevdjtc.c +++ b/gs/src/gdevdjtc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* HP DeskJet 500C driver */ #include "gdevprn.h" #include "gdevpcl.h" diff --git a/gs/src/gdevdm24.c b/gs/src/gdevdm24.c index d3da8ceac..704eaf5ba 100644 --- a/gs/src/gdevdm24.c +++ b/gs/src/gdevdm24.c @@ -19,7 +19,7 @@ #include "gdevprn.h" -/*$Id$*/ + /* High-res 24Dot-matrix printer driver */ /* Supported printers diff --git a/gs/src/gdevdrop.c b/gs/src/gdevdrop.c index 60729e642..ecb2333f2 100644 --- a/gs/src/gdevdrop.c +++ b/gs/src/gdevdrop.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Default and device-independent RasterOp algorithms */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gdevemap.c b/gs/src/gdevemap.c index 8f3d7761f..799207c1c 100644 --- a/gs/src/gdevemap.c +++ b/gs/src/gdevemap.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Mappings between StandardEncoding and ISOLatin1Encoding */ #include "std.h" diff --git a/gs/src/gdevepsc.c b/gs/src/gdevepsc.c index 27ae09139..0550c5e65 100644 --- a/gs/src/gdevepsc.c +++ b/gs/src/gdevepsc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Epson color dot-matrix printer driver by dave@exlog.com */ #include "gdevprn.h" diff --git a/gs/src/gdevepsn.c b/gs/src/gdevepsn.c index 271c0deef..100ceda58 100644 --- a/gs/src/gdevepsn.c +++ b/gs/src/gdevepsn.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* * Epson (and similar) dot-matrix printer driver for Ghostscript. * diff --git a/gs/src/gdevescp.c b/gs/src/gdevescp.c index 52938bfb4..4936af07e 100644 --- a/gs/src/gdevescp.c +++ b/gs/src/gdevescp.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* * Epson 'ESC/P 2' language printer driver. * diff --git a/gs/src/gdevevga.c b/gs/src/gdevevga.c index 86c8b5b4d..b3364dda3 100644 --- a/gs/src/gdevevga.c +++ b/gs/src/gdevevga.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* IBM PC EGA and VGA display drivers */ /* All of the real code is in gdevpcfb.c. */ #include "memory_.h" diff --git a/gs/src/gdevherc.c b/gs/src/gdevherc.c index 3b6b376c6..8194b39c3 100644 --- a/gs/src/gdevherc.c +++ b/gs/src/gdevherc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* IBM PC-compatible Hercules Graphics display driver */ /* using direct access to frame buffer */ diff --git a/gs/src/gdevhit.c b/gs/src/gdevhit.c index 00ad122f9..48ea28fc8 100644 --- a/gs/src/gdevhit.c +++ b/gs/src/gdevhit.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Hit detection device */ #include "std.h" #include "gserror.h" diff --git a/gs/src/gdevht.c b/gs/src/gdevht.c index 3ce1dd485..fd2499ee7 100644 --- a/gs/src/gdevht.c +++ b/gs/src/gdevht.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Halftoning device implementation */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gdevht.h b/gs/src/gdevht.h index f49b43324..16faa0261 100644 --- a/gs/src/gdevht.h +++ b/gs/src/gdevht.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gxdevice.h */ #ifndef gdevht_INCLUDED diff --git a/gs/src/gdevimgn.c b/gs/src/gdevimgn.c index 2d9c2b06b..7010383aa 100644 --- a/gs/src/gdevimgn.c +++ b/gs/src/gdevimgn.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* ---------------------------------------------------------- */ /* gdevimgn.c - version 1.4 */ /* Imagen ImPRESS printer driver */ diff --git a/gs/src/gdevjpeg.c b/gs/src/gdevjpeg.c index ea0482506..0db65b358 100644 --- a/gs/src/gdevjpeg.c +++ b/gs/src/gdevjpeg.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* JPEG output driver */ #include "stdio_.h" /* for jpeglib.h */ #include "jpeglib.h" diff --git a/gs/src/gdevl256.c b/gs/src/gdevl256.c index d4da4904a..8824d3791 100644 --- a/gs/src/gdevl256.c +++ b/gs/src/gdevl256.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Ghostscript driver for 256-color VGA modes with Linux and vgalib */ /* This Driver was derived from the BGI-Driver. It was written only for my own purpose. I never planned to release it or send diff --git a/gs/src/gdevlbp8.c b/gs/src/gdevlbp8.c index 9619d08ad..73fa7a7cf 100644 --- a/gs/src/gdevlbp8.c +++ b/gs/src/gdevlbp8.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Canon LBP-8II and LIPS III driver */ #include "gdevprn.h" diff --git a/gs/src/gdevlj56.c b/gs/src/gdevlj56.c index 86b19fda0..647426661 100644 --- a/gs/src/gdevlj56.c +++ b/gs/src/gdevlj56.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* H-P LaserJet 5 & 6 drivers for Ghostscript */ #include "gdevprn.h" #include "gdevpcl.h" diff --git a/gs/src/gdevlp8k.c b/gs/src/gdevlp8k.c index 38188810f..72059496b 100644 --- a/gs/src/gdevlp8k.c +++ b/gs/src/gdevlp8k.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* EPSON LP-8000 ESC-sequence Laser Printer driver for Ghostscript. diff --git a/gs/src/gdevm1.c b/gs/src/gdevm1.c index 346ce115c..73e6f389c 100644 --- a/gs/src/gdevm1.c +++ b/gs/src/gdevm1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Monobit "memory" (stored bitmap) device */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gdevm16.c b/gs/src/gdevm16.c index 45b4fae12..95c14bc18 100644 --- a/gs/src/gdevm16.c +++ b/gs/src/gdevm16.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* 16-bit-per-pixel "memory" (stored bitmap) device */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gdevm2.c b/gs/src/gdevm2.c index 756d98633..8146c4048 100644 --- a/gs/src/gdevm2.c +++ b/gs/src/gdevm2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* 2-bit-per-pixel "memory" (stored bitmap) device */ #include "memory_.h" #include "gx.h" @@ -24,7 +24,6 @@ #include "gxdevmem.h" /* semi-public definitions */ #include "gdevmem.h" /* private definitions */ -/**************** NOTE: copy_rop only works for gray scale ****************/ extern dev_proc_strip_copy_rop(mem_gray_strip_copy_rop); /* ================ Standard (byte-oriented) device ================ */ diff --git a/gs/src/gdevm24.c b/gs/src/gdevm24.c index cd2507f46..73aebe2a3 100644 --- a/gs/src/gdevm24.c +++ b/gs/src/gdevm24.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* 24-bit-per-pixel "memory" (stored bitmap) device */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gdevm32.c b/gs/src/gdevm32.c index 8d600d3db..58c8c0cbb 100644 --- a/gs/src/gdevm32.c +++ b/gs/src/gdevm32.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* 32-bit-per-pixel "memory" (stored bitmap) device */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gdevm4.c b/gs/src/gdevm4.c index 6cafa340b..da352d4e7 100644 --- a/gs/src/gdevm4.c +++ b/gs/src/gdevm4.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* 4-bit-per-pixel "memory" (stored bitmap) device */ #include "memory_.h" #include "gx.h" @@ -24,7 +24,6 @@ #include "gxdevmem.h" /* semi-public definitions */ #include "gdevmem.h" /* private definitions */ -/**************** NOTE: copy_rop only works for gray scale ****************/ extern dev_proc_strip_copy_rop(mem_gray_strip_copy_rop); /* ================ Standard (byte-oriented) device ================ */ diff --git a/gs/src/gdevm8.c b/gs/src/gdevm8.c index 77e2a387a..1c43f56b5 100644 --- a/gs/src/gdevm8.c +++ b/gs/src/gdevm8.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* 8-bit-per-pixel "memory" (stored bitmap) device */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gdevmem.c b/gs/src/gdevmem.c index 7713be3ee..cd73e033c 100644 --- a/gs/src/gdevmem.c +++ b/gs/src/gdevmem.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic "memory" (stored bitmap) device */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gdevmem.h b/gs/src/gdevmem.h index 076d9ea4a..59a1d90f7 100644 --- a/gs/src/gdevmem.h +++ b/gs/src/gdevmem.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Private definitions for memory devices. */ #ifndef gdevmem_INCLUDED diff --git a/gs/src/gdevmgr.c b/gs/src/gdevmgr.c index fc12cfb0f..e5e3c3a7d 100644 --- a/gs/src/gdevmgr.c +++ b/gs/src/gdevmgr.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* MGR device driver */ #include "gdevprn.h" #include "gdevpccm.h" diff --git a/gs/src/gdevmgr.h b/gs/src/gdevmgr.h index 2c45f59b1..7fe3eb74d 100644 --- a/gs/src/gdevmgr.h +++ b/gs/src/gdevmgr.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Common header file for MGR devices */ #ifndef gdevmgr_INCLUDED diff --git a/gs/src/gdevmiff.c b/gs/src/gdevmiff.c index 31ef7eb30..1d22a5450 100644 --- a/gs/src/gdevmiff.c +++ b/gs/src/gdevmiff.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* MIFF file format driver */ #include "gdevprn.h" diff --git a/gs/src/gdevmpla.c b/gs/src/gdevmpla.c index 5f973a60d..aa14e08c0 100644 --- a/gs/src/gdevmpla.c +++ b/gs/src/gdevmpla.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Any-depth planar "memory" (stored bitmap) devices */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gdevmrop.c b/gs/src/gdevmrop.c index 2685d3342..c5c5e288c 100644 --- a/gs/src/gdevmrop.c +++ b/gs/src/gdevmrop.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* RasterOp / transparency implementation for memory devices */ #include "memory_.h" #include "gx.h" @@ -300,6 +300,35 @@ mem_mono_strip_copy_rop(gx_device * dev, /* ---------------- Fake RasterOp for 2- and 4-bit devices ---------------- */ +/* + * Define patched versions of the driver procedures that may be called + * by mem_mono_strip_copy_rop (see below). Currently we just punt to + * the slow, general case; we could do a lot better. + */ +private int +mem_gray_rop_fill_rectangle(gx_device * dev, int x, int y, int w, int h, + gx_color_index color) +{ + return -1; +} +private int +mem_gray_rop_copy_mono(gx_device * dev, const byte * data, + int dx, int raster, gx_bitmap_id id, + int x, int y, int w, int h, + gx_color_index zero, gx_color_index one) +{ + return -1; +} +private int +mem_gray_rop_strip_tile_rectangle(gx_device * dev, + const gx_strip_bitmap * tiles, + int x, int y, int w, int h, + gx_color_index color0, gx_color_index color1, + int px, int py) +{ + return -1; +} + int mem_gray_strip_copy_rop(gx_device * dev, const byte * sdata, int sourcex, uint sraster, gx_bitmap_id id, @@ -369,13 +398,44 @@ mem_gray_strip_copy_rop(gx_device * dev, real_tcolors = tcolors2; } } - dev->width <<= log2_depth; - code = mem_mono_strip_copy_rop(dev, sdata, - (real_scolors == NULL ? sourcex << log2_depth : sourcex), - sraster, id, real_scolors, real_texture, real_tcolors, - x << log2_depth, y, width << log2_depth, height, - phase_x << log2_depth, phase_y, lop); - dev->width >>= log2_depth; + /* + * mem_mono_strip_copy_rop may call fill_rectangle, copy_mono, or + * strip_tile_rectangle for special cases. Patch those procedures + * temporarily so they will either do the right thing or return + * an error. + */ + { + dev_proc_fill_rectangle((*fill_rectangle)) = + dev_proc(dev, fill_rectangle); + dev_proc_copy_mono((*copy_mono)) = + dev_proc(dev, copy_mono); + dev_proc_strip_tile_rectangle((*strip_tile_rectangle)) = + dev_proc(dev, strip_tile_rectangle); + + set_dev_proc(dev, fill_rectangle, mem_gray_rop_fill_rectangle); + set_dev_proc(dev, copy_mono, mem_gray_rop_copy_mono); + set_dev_proc(dev, strip_tile_rectangle, + mem_gray_rop_strip_tile_rectangle); + dev->width <<= log2_depth; + code = mem_mono_strip_copy_rop(dev, sdata, + (real_scolors == NULL ? + sourcex << log2_depth : sourcex), + sraster, id, real_scolors, + real_texture, real_tcolors, + x << log2_depth, y, + width << log2_depth, height, + phase_x << log2_depth, phase_y, lop); + set_dev_proc(dev, fill_rectangle, fill_rectangle); + set_dev_proc(dev, copy_mono, copy_mono); + set_dev_proc(dev, strip_tile_rectangle, strip_tile_rectangle); + dev->width >>= log2_depth; + } + /* If we punted, use the general procedure. */ + if (code < 0) + return gx_default_strip_copy_rop(dev, sdata, sourcex, sraster, id, + scolors, textures, tcolors, + x, y, width, height, + phase_x, phase_y, lop); return code; } diff --git a/gs/src/gdevmrop.h b/gs/src/gdevmrop.h index b65d46988..017d8c805 100644 --- a/gs/src/gdevmrop.h +++ b/gs/src/gdevmrop.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for device RasterOp implementations. */ /* Requires gxdevmem.h, gsropt.h */ diff --git a/gs/src/gdevmswn.c b/gs/src/gdevmswn.c index 3473e468e..5bd6600c3 100644 --- a/gs/src/gdevmswn.c +++ b/gs/src/gdevmswn.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* * Microsoft Windows 3.n driver for Ghostscript. * Original version by Russell Lang and Maurice Castro with help from diff --git a/gs/src/gdevmswn.h b/gs/src/gdevmswn.h index e38bbb248..a4e90f34f 100644 --- a/gs/src/gdevmswn.h +++ b/gs/src/gdevmswn.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Shared definitions for Microsoft Windows 3.n drivers */ #ifndef gdevmswn_INCLUDED diff --git a/gs/src/gdevmsxf.c b/gs/src/gdevmsxf.c index cd1bfeae5..7827f0d70 100644 --- a/gs/src/gdevmsxf.c +++ b/gs/src/gdevmsxf.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* External font (xfont) implementation for Microsoft Windows. */ #include "ctype_.h" #include "math_.h" diff --git a/gs/src/gdevn533.c b/gs/src/gdevn533.c index 87dedfc23..5be341901 100644 --- a/gs/src/gdevn533.c +++ b/gs/src/gdevn533.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Sony NWP-533 driver for GhostScript */ #include "gdevprn.h" #define prn_dev ((gx_device_printer *)dev) /* needed in 5.31 et seq */ diff --git a/gs/src/gdevnfwd.c b/gs/src/gdevnfwd.c index 102fc8776..dff127333 100644 --- a/gs/src/gdevnfwd.c +++ b/gs/src/gdevnfwd.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Null and forwarding device implementation */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gdevo182.c b/gs/src/gdevo182.c index cf72852be..2fb97446d 100644 --- a/gs/src/gdevo182.c +++ b/gs/src/gdevo182.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Okidata Microline 182 printer driver */ /* Contributed by Maarten Koning (smeg@bnr.ca) April 4, 1993 */ diff --git a/gs/src/gdevokii.c b/gs/src/gdevokii.c index 7b0fc5598..f334fa3bb 100644 --- a/gs/src/gdevokii.c +++ b/gs/src/gdevokii.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* * Okidata IBM compatible dot-matrix printer driver for Ghostscript. * diff --git a/gs/src/gdevos2p.c b/gs/src/gdevos2p.c index 7038ebdaa..620ae38e0 100644 --- a/gs/src/gdevos2p.c +++ b/gs/src/gdevos2p.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* * OS/2 printer device * by Russell Lang. diff --git a/gs/src/gdevp2up.c b/gs/src/gdevp2up.c index 95701ec81..b58e96ce6 100644 --- a/gs/src/gdevp2up.c +++ b/gs/src/gdevp2up.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* A "2-up" PCX device for testing page objects. */ #include "gdevprn.h" #include "gdevpccm.h" diff --git a/gs/src/gdevpbm.c b/gs/src/gdevpbm.c index c5f323fc0..876a481e3 100644 --- a/gs/src/gdevpbm.c +++ b/gs/src/gdevpbm.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Portable Bit/Gray/PixMap drivers */ #include "gdevprn.h" #include "gscdefs.h" diff --git a/gs/src/gdevpccm.c b/gs/src/gdevpccm.c index de2af2680..3e073cf37 100644 --- a/gs/src/gdevpccm.c +++ b/gs/src/gdevpccm.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Support routines for PC color mapping */ #include "gx.h" #include "gsmatrix.h" /* for gxdevice.h */ diff --git a/gs/src/gdevpccm.h b/gs/src/gdevpccm.h index f014b6175..2a1680a4b 100644 --- a/gs/src/gdevpccm.h +++ b/gs/src/gdevpccm.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gxdevice.h */ #ifndef gdevpccm_INCLUDED diff --git a/gs/src/gdevpcfb.c b/gs/src/gdevpcfb.c index 43144750e..daad7ea38 100644 --- a/gs/src/gdevpcfb.c +++ b/gs/src/gdevpcfb.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* IBM PC frame buffer (EGA/VGA) drivers */ #include "memory_.h" #include "gconfigv.h" /* for USE_ASM */ diff --git a/gs/src/gdevpcfb.h b/gs/src/gdevpcfb.h index 0999c961c..9d22ee5a4 100644 --- a/gs/src/gdevpcfb.h +++ b/gs/src/gdevpcfb.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* IBM PC frame buffer definitions */ #ifndef gdevpcfb_INCLUDED diff --git a/gs/src/gdevpcl.c b/gs/src/gdevpcl.c index 6b7601377..dd4cc321d 100644 --- a/gs/src/gdevpcl.c +++ b/gs/src/gdevpcl.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Utilities for PCL printers */ #include "gdevprn.h" #include "gdevpcl.h" diff --git a/gs/src/gdevpcl.h b/gs/src/gdevpcl.h index be9870186..a81b5710c 100644 --- a/gs/src/gdevpcl.h +++ b/gs/src/gdevpcl.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gdevprn.h */ #ifndef gdevpcl_INCLUDED diff --git a/gs/src/gdevpcx.c b/gs/src/gdevpcx.c index ff74571da..ef2e97488 100644 --- a/gs/src/gdevpcx.c +++ b/gs/src/gdevpcx.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* PCX file format drivers */ #include "gdevprn.h" #include "gdevpccm.h" diff --git a/gs/src/gdevpdf.c b/gs/src/gdevpdf.c index c8a9ca98e..e717abf89 100644 --- a/gs/src/gdevpdf.c +++ b/gs/src/gdevpdf.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* PDF-writing driver */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/gdevpdfd.c b/gs/src/gdevpdfd.c index 0d5f3c51f..3a4f614d0 100644 --- a/gs/src/gdevpdfd.c +++ b/gs/src/gdevpdfd.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Path drawing procedures for pdfwrite driver */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gdevpdfi.c b/gs/src/gdevpdfi.c index 0938ed32f..cb8d377e5 100644 --- a/gs/src/gdevpdfi.c +++ b/gs/src/gdevpdfi.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Image handling for PDF-writing driver */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/gdevpdfm.c b/gs/src/gdevpdfm.c index d11b0213b..9814faa2c 100644 --- a/gs/src/gdevpdfm.c +++ b/gs/src/gdevpdfm.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* pdfmark processing for PDF-writing driver */ #include "memory_.h" #include "string_.h" diff --git a/gs/src/gdevpdfo.c b/gs/src/gdevpdfo.c index 8ee51aeba..caf0aafbd 100644 --- a/gs/src/gdevpdfo.c +++ b/gs/src/gdevpdfo.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Named object pdfmark processing */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gdevpdfp.c b/gs/src/gdevpdfp.c index 2a82a8c68..cdea186df 100644 --- a/gs/src/gdevpdfp.c +++ b/gs/src/gdevpdfp.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Get/put parameters for PDF-writing driver */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gdevpdft.c b/gs/src/gdevpdft.c index 328e09719..6b5e42428 100644 --- a/gs/src/gdevpdft.c +++ b/gs/src/gdevpdft.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Text handling for PDF-writing driver. */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/gdevpdfx.h b/gs/src/gdevpdfx.h index a1617ce62..c8d5573d4 100644 --- a/gs/src/gdevpdfx.h +++ b/gs/src/gdevpdfx.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal definitions for PDF-writing driver. */ #ifndef gdevpdfx_INCLUDED diff --git a/gs/src/gdevpe.c b/gs/src/gdevpe.c index 4169d5704..4b2b3fd7b 100644 --- a/gs/src/gdevpe.c +++ b/gs/src/gdevpe.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Private Eye display driver Hacked by Fran Taylor, Reflection Technology Inc. */ diff --git a/gs/src/gdevpipe.c b/gs/src/gdevpipe.c index f0ad419a2..ec0b60202 100644 --- a/gs/src/gdevpipe.c +++ b/gs/src/gdevpipe.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* %pipe% IODevice */ #include "errno_.h" #include "pipe_.h" diff --git a/gs/src/gdevpjet.c b/gs/src/gdevpjet.c index dd8a5934c..21db11383 100644 --- a/gs/src/gdevpjet.c +++ b/gs/src/gdevpjet.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* H-P PaintJet, PaintJet XL, and DEC LJ250 drivers. */ /* Thanks to Rob Reiss (rob@moray.berkeley.edu) for the PaintJet XL */ /* modifications. */ diff --git a/gs/src/gdevpm.c b/gs/src/gdevpm.c index 51cfc056c..23f140d84 100644 --- a/gs/src/gdevpm.c +++ b/gs/src/gdevpm.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* * OS/2 Presentation manager driver * By Russell Lang (based on gdevmswn.c and gdevwdib.c) diff --git a/gs/src/gdevpm.h b/gs/src/gdevpm.h index a8f85c83b..41cc44c67 100644 --- a/gs/src/gdevpm.h +++ b/gs/src/gdevpm.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Defines common to gdevpm.c, gspmdrv.c and PM GSview */ #ifndef gdevpm_INCLUDED diff --git a/gs/src/gdevpng.c b/gs/src/gdevpng.c index 42db6e357..29d7898e4 100644 --- a/gs/src/gdevpng.c +++ b/gs/src/gdevpng.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* PNG (Portable Network Graphics) Format. Pronounced "ping". */ /* lpd 1997-07-20: changed from using gs_malloc/png_xxx_int to png_create_xxx * for allocating structures, and from gs_free to png_write_destroy for diff --git a/gs/src/gdevprn.c b/gs/src/gdevprn.c index cb0b7d1c6..f638e0891 100644 --- a/gs/src/gdevprn.c +++ b/gs/src/gdevprn.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic printer driver support */ #include "ctype_.h" #include "gdevprn.h" diff --git a/gs/src/gdevprn.h b/gs/src/gdevprn.h index eb3badd30..8e0d8f737 100644 --- a/gs/src/gdevprn.h +++ b/gs/src/gdevprn.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Common header file for memory-buffered printers */ #ifndef gdevprn_INCLUDED diff --git a/gs/src/gdevprna.h b/gs/src/gdevprna.h index e0aa339b7..bb05d0437 100644 --- a/gs/src/gdevprna.h +++ b/gs/src/gdevprna.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic asynchronous printer driver support */ /* Initial version 2/1/1998 by John Desrosiers (soho@crl.com) */ diff --git a/gs/src/gdevps.c b/gs/src/gdevps.c index 756cc3708..cd3841828 100644 --- a/gs/src/gdevps.c +++ b/gs/src/gdevps.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* PostScript-writing driver */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/gdevpsci.c b/gs/src/gdevpsci.c index ada63d590..cf0268247 100644 --- a/gs/src/gdevpsci.c +++ b/gs/src/gdevpsci.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* PostScript color image output device */ #include "gdevprn.h" #include "stream.h" diff --git a/gs/src/gdevpsde.c b/gs/src/gdevpsde.c index d433263c4..14f4a58f5 100644 --- a/gs/src/gdevpsde.c +++ b/gs/src/gdevpsde.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Embedded font writing */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gdevpsdf.c b/gs/src/gdevpsdf.c index cc8da37a2..9b660d38c 100644 --- a/gs/src/gdevpsdf.c +++ b/gs/src/gdevpsdf.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Common utilities for PostScript and PDF writers */ #include "string_.h" #include "gx.h" diff --git a/gs/src/gdevpsdf.h b/gs/src/gdevpsdf.h index 19b0669c1..71baffa62 100644 --- a/gs/src/gdevpsdf.h +++ b/gs/src/gdevpsdf.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Common output syntax and parameters for PostScript and PDF writers */ #ifndef gdevpsdf_INCLUDED diff --git a/gs/src/gdevpsdi.c b/gs/src/gdevpsdi.c index eb34c051d..e398b32cb 100644 --- a/gs/src/gdevpsdi.c +++ b/gs/src/gdevpsdi.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Image compression for PostScript and PDF writers */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gdevpsdp.c b/gs/src/gdevpsdp.c index 009364d5b..f35f7c589 100644 --- a/gs/src/gdevpsdp.c +++ b/gs/src/gdevpsdp.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* (Distiller) parameter handling for PostScript and PDF writers */ #include "string_.h" #include "gx.h" diff --git a/gs/src/gdevpsds.c b/gs/src/gdevpsds.c index f4f2b9b13..219168591 100644 --- a/gs/src/gdevpsds.c +++ b/gs/src/gdevpsds.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Image processing streams for PostScript and PDF writers */ #include "gx.h" #include "memory_.h" diff --git a/gs/src/gdevpsds.h b/gs/src/gdevpsds.h index 630cfac07..86db1f0b5 100644 --- a/gs/src/gdevpsds.h +++ b/gs/src/gdevpsds.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Image processing stream interface for PostScript and PDF writers */ #ifndef gdevpsds_INCLUDED diff --git a/gs/src/gdevpsim.c b/gs/src/gdevpsim.c index 77fcec2d4..e131425a1 100644 --- a/gs/src/gdevpsim.c +++ b/gs/src/gdevpsim.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* PostScript image output device */ #include "gdevprn.h" diff --git a/gs/src/gdevpstr.c b/gs/src/gdevpstr.c index 937620863..24e40d8cd 100644 --- a/gs/src/gdevpstr.c +++ b/gs/src/gdevpstr.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Stream output for PostScript- and PDF-writing drivers */ #include "math_.h" /* for fabs */ #include "stdio_.h" /* for stream.h */ diff --git a/gs/src/gdevpstr.h b/gs/src/gdevpstr.h index edc41bc45..3f7596c05 100644 --- a/gs/src/gdevpstr.h +++ b/gs/src/gdevpstr.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Stream output for PostScript- and PDF-writing drivers. */ #ifndef gdevpstr_INCLUDED diff --git a/gs/src/gdevpx.c b/gs/src/gdevpx.c index cac9dc06d..1ad32332c 100644 --- a/gs/src/gdevpx.c +++ b/gs/src/gdevpx.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* H-P PCL XL driver */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/gdevpxat.h b/gs/src/gdevpxat.h index e3c50a1f3..3d9a1d8f8 100644 --- a/gs/src/gdevpxat.h +++ b/gs/src/gdevpxat.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Attribute ID definitions for PCL XL */ #ifndef gdevpxat_INCLUDED diff --git a/gs/src/gdevpxen.h b/gs/src/gdevpxen.h index 809c020f2..46e43641f 100644 --- a/gs/src/gdevpxen.h +++ b/gs/src/gdevpxen.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Enumerated attribute value definitions for PCL XL */ #ifndef gdevpxen_INCLUDED diff --git a/gs/src/gdevpxop.h b/gs/src/gdevpxop.h index 76e5806ef..b2abbe4a1 100644 --- a/gs/src/gdevpxop.h +++ b/gs/src/gdevpxop.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Operator and other tag definitions for PCL XL */ #ifndef gdevpxop_INCLUDED diff --git a/gs/src/gdevrops.c b/gs/src/gdevrops.c index c655dc989..44538123f 100644 --- a/gs/src/gdevrops.c +++ b/gs/src/gdevrops.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* RasterOp source device */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gdevrun.c b/gs/src/gdevrun.c index 559f163fa..adabe42e0 100644 --- a/gs/src/gdevrun.c +++ b/gs/src/gdevrun.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Run-length encoded "device" */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gdevs3ga.c b/gs/src/gdevs3ga.c index bc997bd64..75f839533 100644 --- a/gs/src/gdevs3ga.c +++ b/gs/src/gdevs3ga.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* S3 86C911 driver */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gdevsco.c b/gs/src/gdevsco.c index 9975c73ca..4da6c2eaf 100644 --- a/gs/src/gdevsco.c +++ b/gs/src/gdevsco.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* 17Jul91 - wb - based on gdevpcfb.c */ /* 31Jul91 - Rick Calder rick@rick.att.com - ifdefs for AT&T UNIX 4.0 2.1 */ /* 13Sep91 - wb - modify for gs24b2 */ diff --git a/gs/src/gdevsgi.c b/gs/src/gdevsgi.c index 4a06e120d..e0e12b97a 100644 --- a/gs/src/gdevsgi.c +++ b/gs/src/gdevsgi.c @@ -4,7 +4,7 @@ * public domain. */ -/*$Id$*/ + /* SGI raster file driver */ #include "gdevprn.h" #include "gdevsgi.h" diff --git a/gs/src/gdevsgi.h b/gs/src/gdevsgi.h index 647c5972c..45e527560 100644 --- a/gs/src/gdevsgi.h +++ b/gs/src/gdevsgi.h @@ -7,7 +7,7 @@ * the file image.h on SGI's file server; there is no copyright on that file. */ -/*$Id$*/ + /* SGI raster file definitions */ #ifndef gdevsgi_INCLUDED diff --git a/gs/src/gdevsj48.c b/gs/src/gdevsj48.c index 56b71b070..1b1b9d6aa 100644 --- a/gs/src/gdevsj48.c +++ b/gs/src/gdevsj48.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* --- derived from gdevbj10.c 1993-10-07 * by Mats kerblom (f86ma@dd.chalmers.se). * diff --git a/gs/src/gdevsnfb.c b/gs/src/gdevsnfb.c index 70b40759a..22b39d784 100644 --- a/gs/src/gdevsnfb.c +++ b/gs/src/gdevsnfb.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Sony News frame buffer driver for GhostScript */ #include "gdevprn.h" #define prn_dev ((gx_device_printer *)dev) /* needed in 5.31 et seq */ diff --git a/gs/src/gdevsppr.c b/gs/src/gdevsppr.c index ef2f461ec..79513670d 100644 --- a/gs/src/gdevsppr.c +++ b/gs/src/gdevsppr.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* SPARCprinter driver for Ghostscript */ #include "gdevprn.h" #include <stdio.h> diff --git a/gs/src/gdevstc.c b/gs/src/gdevstc.c index a2085ecb5..b87d05188 100644 --- a/gs/src/gdevstc.c +++ b/gs/src/gdevstc.c @@ -15,7 +15,7 @@ all copies. */ -/*$Id$*/ + /* Epson Stylus-Color Printer-Driver */ /*** diff --git a/gs/src/gdevstc.h b/gs/src/gdevstc.h index 24fcc4f72..257c09f0d 100644 --- a/gs/src/gdevstc.h +++ b/gs/src/gdevstc.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Epson Stylus-Color Printer-Driver */ #ifndef gdevstc_INCLUDED # define gdevstc_INCLUDED diff --git a/gs/src/gdevstc1.c b/gs/src/gdevstc1.c index b87c9d868..6ce212901 100644 --- a/gs/src/gdevstc1.c +++ b/gs/src/gdevstc1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Epson Stylus-Color Printer-Driver */ /*** diff --git a/gs/src/gdevstc2.c b/gs/src/gdevstc2.c index 741144446..40ee698ca 100644 --- a/gs/src/gdevstc2.c +++ b/gs/src/gdevstc2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Epson Stylus-Color Printer-Driver */ /*** diff --git a/gs/src/gdevstc3.c b/gs/src/gdevstc3.c index 36e60128e..2cf90ce16 100644 --- a/gs/src/gdevstc3.c +++ b/gs/src/gdevstc3.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Epson Stylus-Color Printer-Driver */ /*** diff --git a/gs/src/gdevstc4.c b/gs/src/gdevstc4.c index d10b36edb..6ea983a49 100644 --- a/gs/src/gdevstc4.c +++ b/gs/src/gdevstc4.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Epson Stylus-Color Printer-Driver */ /*** diff --git a/gs/src/gdevsun.c b/gs/src/gdevsun.c index a57f6c210..945cc8da3 100644 --- a/gs/src/gdevsun.c +++ b/gs/src/gdevsun.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* SunView driver */ #include "gx.h" /* for gx_bitmap; includes std.h */ diff --git a/gs/src/gdevsvga.c b/gs/src/gdevsvga.c index b779dc1cb..8c632d8f8 100644 --- a/gs/src/gdevsvga.c +++ b/gs/src/gdevsvga.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* SuperVGA display drivers */ #include "memory_.h" #include "gconfigv.h" /* for USE_ASM */ diff --git a/gs/src/gdevsvga.h b/gs/src/gdevsvga.h index aa9c5bf9b..3c0fe16e3 100644 --- a/gs/src/gdevsvga.h +++ b/gs/src/gdevsvga.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gdevpcfb.h */ #ifndef gdevsvga_INCLUDED diff --git a/gs/src/gdevtfax.c b/gs/src/gdevtfax.c index a82045292..cd98247c9 100644 --- a/gs/src/gdevtfax.c +++ b/gs/src/gdevtfax.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* TIFF and fax devices */ #include "gdevprn.h" #include "gdevtifs.h" /* for TIFF output only */ diff --git a/gs/src/gdevtfnx.c b/gs/src/gdevtfnx.c index d63d96e7f..718e834b6 100644 --- a/gs/src/gdevtfnx.c +++ b/gs/src/gdevtfnx.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* 12-bit & 24-bit RGB uncompressed TIFF driver */ #include "gdevprn.h" #include "gdevtifs.h" diff --git a/gs/src/gdevtifs.c b/gs/src/gdevtifs.c index 4f4b89c89..f786b014e 100644 --- a/gs/src/gdevtifs.c +++ b/gs/src/gdevtifs.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* TIFF-writing substructure */ #include "stdio_.h" #include "time_.h" diff --git a/gs/src/gdevtifs.h b/gs/src/gdevtifs.h index 919a41fc4..43c19ecac 100644 --- a/gs/src/gdevtifs.h +++ b/gs/src/gdevtifs.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for writing TIFF file formats. */ #ifndef gdevtifs_INCLUDED diff --git a/gs/src/gdevtknk.c b/gs/src/gdevtknk.c index 2d27b399a..cf11bf9b7 100644 --- a/gs/src/gdevtknk.c +++ b/gs/src/gdevtknk.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Tektronix Ink-jet plotter driver. This code is written for 4696 and 4695 plotters, it may easily be diff --git a/gs/src/gdevvec.c b/gs/src/gdevvec.c index e8e908d8f..04e117dd1 100644 --- a/gs/src/gdevvec.c +++ b/gs/src/gdevvec.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Utilities for "vector" devices */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/gdevvec.h b/gs/src/gdevvec.h index 522e8577d..981f44910 100644 --- a/gs/src/gdevvec.h +++ b/gs/src/gdevvec.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Common definitions for "vector" devices */ #ifndef gdevvec_INCLUDED diff --git a/gs/src/gdevvglb.c b/gs/src/gdevvglb.c index 48ca5d2c4..6f1a19d60 100644 --- a/gs/src/gdevvglb.c +++ b/gs/src/gdevvglb.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* * This is a driver for 386 PCs using VGALIB for graphics on the console * display. diff --git a/gs/src/gdevwddb.c b/gs/src/gdevwddb.c index 1d1e87940..f10ad4b53 100644 --- a/gs/src/gdevwddb.c +++ b/gs/src/gdevwddb.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* * Microsoft Windows 3.n driver for Ghostscript, * using device-dependent bitmap. diff --git a/gs/src/gdevwdib.c b/gs/src/gdevwdib.c index cdfe03c01..29517490a 100644 --- a/gs/src/gdevwdib.c +++ b/gs/src/gdevwdib.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* MS Windows 3.n driver for Ghostscript using a DIB for buffering. */ #include "gdevmswn.h" #include "gxdevmem.h" diff --git a/gs/src/gdevwpr2.c b/gs/src/gdevwpr2.c index 7cc3cea44..8101630b9 100644 --- a/gs/src/gdevwpr2.c +++ b/gs/src/gdevwpr2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* * Microsoft Windows 3.n printer driver for Ghostscript. * Original version by Russell Lang and diff --git a/gs/src/gdevwprn.c b/gs/src/gdevwprn.c index 99055a020..86e4d5f53 100644 --- a/gs/src/gdevwprn.c +++ b/gs/src/gdevwprn.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* * Microsoft Windows 3.n printer driver for Ghostscript. * Original version by Russell Lang and diff --git a/gs/src/gdevx.c b/gs/src/gdevx.c index 40aa2daec..6570add9c 100644 --- a/gs/src/gdevx.c +++ b/gs/src/gdevx.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* X Windows driver for Ghostscript library */ /* The X include files include <sys/types.h>, which, on some machines */ /* at least, define uint, ushort, and ulong, which std.h also defines. */ diff --git a/gs/src/gdevx.h b/gs/src/gdevx.h index 8641526aa..b0606b569 100644 --- a/gs/src/gdevx.h +++ b/gs/src/gdevx.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gxdevice.h and x_.h */ #ifndef gdevx_INCLUDED diff --git a/gs/src/gdevxalt.c b/gs/src/gdevxalt.c index ea9bdb11b..eeb27878e 100644 --- a/gs/src/gdevxalt.c +++ b/gs/src/gdevxalt.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Alternative X Windows drivers for help in driver debugging */ #include "gx.h" /* for gx_bitmap; includes std.h */ #include "math_.h" @@ -565,10 +565,10 @@ const gx_device_X_wrapper gs_x11mono_device = 0 /* target */ }; -/* ---------------- 2-bit gray-scale procedures ---------------- */ +/* ---------------- 2- and 4-bit gray-scale procedures ---------------- */ /* The device descriptor */ -private const gx_device_procs x_gray2_procs = +private const gx_device_procs x_gray_procs = { x_wrap_open, gx_forward_get_initial_matrix, @@ -594,10 +594,10 @@ private const gx_device_procs x_gray2_procs = NULL /* copy_alpha */ }; -/* The instance is public. */ +/* The instances are public. */ const gx_device_X_wrapper gs_x11gray2_device = { - std_device_dci_body(gx_device_X_wrapper, &x_gray2_procs, "x11gray2", + std_device_dci_body(gx_device_X_wrapper, &x_gray_procs, "x11gray2", FAKE_RES * 85 / 10, FAKE_RES * 11, /* x and y extent (nominal) */ FAKE_RES, FAKE_RES, /* x and y density (nominal) */ 1, 2, 3, 0, 4, 0), @@ -605,6 +605,16 @@ const gx_device_X_wrapper gs_x11gray2_device = 0 /* target */ }; +const gx_device_X_wrapper gs_x11gray4_device = +{ + std_device_dci_body(gx_device_X_wrapper, &x_gray_procs, "x11gray4", + FAKE_RES * 85 / 10, FAKE_RES * 11, /* x and y extent (nominal) */ + FAKE_RES, FAKE_RES, /* x and y density (nominal) */ + 1, 4, 15, 0, 16, 0), + {0}, /* std_procs */ + 0 /* target */ +}; + /* ---------------- Alpha procedures ---------------- */ /* Device procedures */ diff --git a/gs/src/gdevxini.c b/gs/src/gdevxini.c index 75a9f8a6f..5dc76ede2 100644 --- a/gs/src/gdevxini.c +++ b/gs/src/gdevxini.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* X Windows driver initialization for Ghostscript library */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/gdevxxf.c b/gs/src/gdevxxf.c index 097afa303..981b1bf6a 100644 --- a/gs/src/gdevxxf.c +++ b/gs/src/gdevxxf.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* External font (xfont) implementation for X11. */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/genarch.c b/gs/src/genarch.c index 92dfd677d..55f5d439c 100644 --- a/gs/src/genarch.c +++ b/gs/src/genarch.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generate a header file (arch.h) with parameters */ /* reflecting the machine architecture and compiler characteristics. */ diff --git a/gs/src/genconf.c b/gs/src/genconf.c index 2ba8ccb99..cef677cdf 100644 --- a/gs/src/genconf.c +++ b/gs/src/genconf.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generate configuration files */ #include "stdpre.h" #include <assert.h> diff --git a/gs/src/gendev.c b/gs/src/gendev.c index 06187ec76..11ec055f8 100644 --- a/gs/src/gendev.c +++ b/gs/src/gendev.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generate .dev configuration files */ #include "stdpre.h" #include <assert.h> diff --git a/gs/src/geninit.c b/gs/src/geninit.c index 877267951..2b3efb32f 100644 --- a/gs/src/geninit.c +++ b/gs/src/geninit.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Utility for merging all the Ghostscript initialization files */ /* (gs_*.ps) into a single file, optionally converting them to C data. */ #include "stdpre.h" diff --git a/gs/src/ghost.h b/gs/src/ghost.h index 0d24d4244..2a305abb7 100644 --- a/gs/src/ghost.h +++ b/gs/src/ghost.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Common definitions for interpreter */ #ifndef ghost_INCLUDED diff --git a/gs/src/gp.h b/gs/src/gp.h index 9633d6b56..6467e5735 100644 --- a/gs/src/gp.h +++ b/gs/src/gp.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to platform-specific routines */ /* Requires gsmemory.h, gstypes.h */ diff --git a/gs/src/gp_dosfb.c b/gs/src/gp_dosfb.c index 28bd43b05..970499885 100644 --- a/gs/src/gp_dosfb.c +++ b/gs/src/gp_dosfb.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* MS-DOS frame buffer swapping routines for Ghostscript */ #include <conio.h> #include "malloc_.h" diff --git a/gs/src/gp_dosfe.c b/gs/src/gp_dosfe.c index 218e39f12..4728aa3cc 100644 --- a/gs/src/gp_dosfe.c +++ b/gs/src/gp_dosfe.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* MS-DOS file enumeration. */ #include "stdio_.h" #include <fcntl.h> diff --git a/gs/src/gp_dosfs.c b/gs/src/gp_dosfs.c index 6f24fe072..2034f7d71 100644 --- a/gs/src/gp_dosfs.c +++ b/gs/src/gp_dosfs.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Common routines for MS-DOS (any compiler) and DesqView/X, */ /* which has a MS-DOS-like file system. */ #include "dos_.h" diff --git a/gs/src/gp_dvx.c b/gs/src/gp_dvx.c index 67de86a2e..0c6abdc7d 100644 --- a/gs/src/gp_dvx.c +++ b/gs/src/gp_dvx.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Desqview/X-specific routines for Ghostscript */ #include "string_.h" #include "gx.h" diff --git a/gs/src/gp_getnv.c b/gs/src/gp_getnv.c index 2f414b12d..9f11fb745 100644 --- a/gs/src/gp_getnv.c +++ b/gs/src/gp_getnv.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Standard implementation of gp_getenv */ #include "stdio_.h" #include "string_.h" diff --git a/gs/src/gp_iwatc.c b/gs/src/gp_iwatc.c index 310b009d3..4f335b5c8 100644 --- a/gs/src/gp_iwatc.c +++ b/gs/src/gp_iwatc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Intel processor, Watcom C-specific routines for Ghostscript */ #include "dos_.h" #include <fcntl.h> diff --git a/gs/src/gp_msdos.c b/gs/src/gp_msdos.c index b69a5320c..f636f928a 100644 --- a/gs/src/gp_msdos.c +++ b/gs/src/gp_msdos.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Common platform-specific routines for MS-DOS (any compiler) */ #include "stdio_.h" #include "string_.h" /* for strerror */ diff --git a/gs/src/gp_msio.c b/gs/src/gp_msio.c index 9e3bc6768..7a4663f69 100644 --- a/gs/src/gp_msio.c +++ b/gs/src/gp_msio.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* * Streams for Windows text window * Original version by Russell Lang and Maurice Castro with help from diff --git a/gs/src/gp_mslib.c b/gs/src/gp_mslib.c index 213b0031b..3d3605039 100644 --- a/gs/src/gp_mslib.c +++ b/gs/src/gp_mslib.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* * Microsoft Windows 3.n platform support for Graphics Library * diff --git a/gs/src/gp_mswin.c b/gs/src/gp_mswin.c index ea9d7a82d..46ae109bb 100644 --- a/gs/src/gp_mswin.c +++ b/gs/src/gp_mswin.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* * Microsoft Windows 3.n platform support for Ghostscript. * Original version by Russell Lang and Maurice Castro with help from diff --git a/gs/src/gp_mswin.h b/gs/src/gp_mswin.h index 4a2b9fca8..19a42b01b 100644 --- a/gs/src/gp_mswin.h +++ b/gs/src/gp_mswin.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* (used by both C code and Windows 'resource') */ #ifndef gp_mswin_INCLUDED diff --git a/gs/src/gp_nofb.c b/gs/src/gp_nofb.c index f85d01030..ab3140e2f 100644 --- a/gs/src/gp_nofb.c +++ b/gs/src/gp_nofb.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Dummy routines for Ghostscript platforms with no frame buffer management */ #include "gx.h" #include "gp.h" diff --git a/gs/src/gp_ntfs.c b/gs/src/gp_ntfs.c index 98c10bdf1..ca0af7ed5 100644 --- a/gs/src/gp_ntfs.c +++ b/gs/src/gp_ntfs.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* file system stuff for MS-Windows WIN32 and MS-Windows NT */ /* hacked from gp_dosfs.c by Russell Lang */ diff --git a/gs/src/gp_os2.c b/gs/src/gp_os2.c index 214fe76ce..7d3645531 100644 --- a/gs/src/gp_os2.c +++ b/gs/src/gp_os2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Common platform-specific routines for OS/2 and MS-DOS */ /* compiled with GCC/EMX */ diff --git a/gs/src/gp_os9.c b/gs/src/gp_os9.c index be8d7e7ec..578ae70d6 100644 --- a/gs/src/gp_os9.c +++ b/gs/src/gp_os9.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* OSK-specific routines for Ghostscript */ #include "pipe_.h" #include "string_.h" diff --git a/gs/src/gp_sysv.c b/gs/src/gp_sysv.c index 985c07de9..e54cc8037 100644 --- a/gs/src/gp_sysv.c +++ b/gs/src/gp_sysv.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* System V Unix-specific routines for Ghostscript */ /* This file contains a couple of standard Unix library procedures */ diff --git a/gs/src/gp_unifn.c b/gs/src/gp_unifn.c index b4f96b632..59c85f990 100644 --- a/gs/src/gp_unifn.c +++ b/gs/src/gp_unifn.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Unix-like file name syntax platform routines for Ghostscript */ #include "gx.h" #include "gp.h" diff --git a/gs/src/gp_unifs.c b/gs/src/gp_unifs.c index b90cc2c8c..f2497620b 100644 --- a/gs/src/gp_unifs.c +++ b/gs/src/gp_unifs.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* "Unix-like" file system platform routines for Ghostscript */ #include "memory_.h" #include "string_.h" diff --git a/gs/src/gp_unix.c b/gs/src/gp_unix.c index 8a5aeea2a..ff2df3ecc 100644 --- a/gs/src/gp_unix.c +++ b/gs/src/gp_unix.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Unix-specific routines for Ghostscript */ #include "pipe_.h" #include "string_.h" diff --git a/gs/src/gp_vms.c b/gs/src/gp_vms.c index 5321bc7d0..30eec3c9d 100644 --- a/gs/src/gp_vms.c +++ b/gs/src/gp_vms.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* VAX/VMS specific routines for Ghostscript */ #include "string_.h" #include "gx.h" diff --git a/gs/src/gp_wgetv.c b/gs/src/gp_wgetv.c index b847fbdfb..d6f991ead 100644 --- a/gs/src/gp_wgetv.c +++ b/gs/src/gp_wgetv.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* MS Windows implementation of gp_getenv */ #include <windows.h> diff --git a/gs/src/gp_win32.c b/gs/src/gp_win32.c index 3c8978906..bd916e061 100644 --- a/gs/src/gp_win32.c +++ b/gs/src/gp_win32.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Common platform-specific routines for MS-Windows WIN32 */ /* hacked from gp_msdos.c by Russell Lang */ #include "stdio_.h" diff --git a/gs/src/gpcheck.h b/gs/src/gpcheck.h index e10cbf946..fb896754a 100644 --- a/gs/src/gpcheck.h +++ b/gs/src/gpcheck.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interrupt check interface */ #ifndef gpcheck_INCLUDED diff --git a/gs/src/gpgetenv.h b/gs/src/gpgetenv.h index f1a6e339f..f58b038d9 100644 --- a/gs/src/gpgetenv.h +++ b/gs/src/gpgetenv.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to platform-specific getenv routine */ #ifndef gpgetenv_INCLUDED diff --git a/gs/src/gpsync.h b/gs/src/gpsync.h index dd4462388..b93dd54dd 100644 --- a/gs/src/gpsync.h +++ b/gs/src/gpsync.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to platform-dependent synchronization primitives */ #if !defined(gpsync_INCLUDED) diff --git a/gs/src/gs.c b/gs/src/gs.c index d37388fd0..09e022a1e 100644 --- a/gs/src/gs.c +++ b/gs/src/gs.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* 'main' program for Ghostscript */ #include "ghost.h" #include "imain.h" diff --git a/gs/src/gs16spl.c b/gs/src/gs16spl.c index 82caef0f0..6b44d1b16 100644 --- a/gs/src/gs16spl.c +++ b/gs/src/gs16spl.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* 16-bit access to print spooler from Win32s */ /* by Russell Lang */ /* 1995-11-23 */ diff --git a/gs/src/gs16spl.rc b/gs/src/gs16spl.rc index bab57dd89..2513a0dc7 100644 --- a/gs/src/gs16spl.rc +++ b/gs/src/gs16spl.rc @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Resources for GS16SPL.EXE, 16-bit access to print spooler */ /* 1995-11-10 */ diff --git a/gs/src/gsalloc.c b/gs/src/gsalloc.c index 80f498c12..c28803bfb 100644 --- a/gs/src/gsalloc.c +++ b/gs/src/gsalloc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Standard memory allocator */ #include "gx.h" #include "memory_.h" diff --git a/gs/src/gsalloc.h b/gs/src/gsalloc.h index d05b5af5c..3670e427c 100644 --- a/gs/src/gsalloc.h +++ b/gs/src/gsalloc.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Memory allocator extensions for standard allocator */ #ifndef gsalloc_INCLUDED diff --git a/gs/src/gsalpha.c b/gs/src/gsalpha.c index 980c403e1..f0dc44acf 100644 --- a/gs/src/gsalpha.c +++ b/gs/src/gsalpha.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Graphics state alpha value access */ #include "gx.h" #include "gsalpha.h" diff --git a/gs/src/gsalpha.h b/gs/src/gsalpha.h index 0e6d8d4cf..d76fd85ed 100644 --- a/gs/src/gsalpha.h +++ b/gs/src/gsalpha.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* API for alpha value in graphics state */ #ifndef gsalpha_INCLUDED diff --git a/gs/src/gsalphac.c b/gs/src/gsalphac.c index f1415e6de..e031c90f0 100644 --- a/gs/src/gsalphac.c +++ b/gs/src/gsalphac.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Alpha-compositing implementation */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gsalphac.h b/gs/src/gsalphac.h index dcdcb767c..2e33324a8 100644 --- a/gs/src/gsalphac.h +++ b/gs/src/gsalphac.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Alpha-compositing interface */ #ifndef gsalphac_INCLUDED diff --git a/gs/src/gsargs.c b/gs/src/gsargs.c index 10e11e9dd..117547d49 100644 --- a/gs/src/gsargs.c +++ b/gs/src/gsargs.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Command line argument list management */ #include "ctype_.h" #include "stdio_.h" diff --git a/gs/src/gsargs.h b/gs/src/gsargs.h index 055953494..472fb963f 100644 --- a/gs/src/gsargs.h +++ b/gs/src/gsargs.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Command line argument list management */ #ifndef gsargs_INCLUDED diff --git a/gs/src/gsbitmap.h b/gs/src/gsbitmap.h index d523b7ace..dd791b24b 100644 --- a/gs/src/gsbitmap.h +++ b/gs/src/gsbitmap.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Library "client" bitmap structures */ #ifndef gsbitmap_INCLUDED diff --git a/gs/src/gsbitops.c b/gs/src/gsbitops.c index 3f6572dfa..a8a996942 100644 --- a/gs/src/gsbitops.c +++ b/gs/src/gsbitops.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Bitmap filling, copying, and transforming operations */ #include "stdio_.h" #include "memory_.h" diff --git a/gs/src/gsbitops.h b/gs/src/gsbitops.h index c1d51acf2..5c7034e98 100644 --- a/gs/src/gsbitops.h +++ b/gs/src/gsbitops.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface for bitmap operations */ #ifndef gsbitops_INCLUDED diff --git a/gs/src/gsbittab.c b/gs/src/gsbittab.c index d532b4eaa..d8e6c15b4 100644 --- a/gs/src/gsbittab.c +++ b/gs/src/gsbittab.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Tables for bit operations */ #include "stdpre.h" #include "gsbittab.h" diff --git a/gs/src/gsbittab.h b/gs/src/gsbittab.h index 18f291b41..8f2224469 100644 --- a/gs/src/gsbittab.h +++ b/gs/src/gsbittab.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to tables for bit operations */ #ifndef gsbittab_INCLUDED diff --git a/gs/src/gsccode.h b/gs/src/gsccode.h index 4c5bdff57..0152cdfc2 100644 --- a/gs/src/gsccode.h +++ b/gs/src/gsccode.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Types for character codes */ #ifndef gsccode_INCLUDED diff --git a/gs/src/gsccolor.h b/gs/src/gsccolor.h index d29ff07de..6e006f181 100644 --- a/gs/src/gsccolor.h +++ b/gs/src/gsccolor.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client color structure definition */ #ifndef gsccolor_INCLUDED diff --git a/gs/src/gscdef.c b/gs/src/gscdef.c index 60193982c..44a8b412a 100644 --- a/gs/src/gscdef.c +++ b/gs/src/gscdef.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Configuration scalars */ #include "stdpre.h" #include "gscdefs.h" /* interface */ diff --git a/gs/src/gscdefs.h b/gs/src/gscdefs.h index 54ccf157e..81a4e8fbb 100644 --- a/gs/src/gscdefs.h +++ b/gs/src/gscdefs.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Prototypes for configuration definitions in gconfig.c. */ #ifndef gscdefs_INCLUDED diff --git a/gs/src/gscdevn.c b/gs/src/gscdevn.c index d6e78cb8e..76c286876 100644 --- a/gs/src/gscdevn.c +++ b/gs/src/gscdevn.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* DeviceN color space and operation definition */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gschar.c b/gs/src/gschar.c index 96d280256..2ee7ce799 100644 --- a/gs/src/gschar.c +++ b/gs/src/gschar.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Character writing operators for Ghostscript library */ #include "gx.h" #include "memory_.h" diff --git a/gs/src/gschar.h b/gs/src/gschar.h index 9b564f809..a4099358e 100644 --- a/gs/src/gschar.h +++ b/gs/src/gschar.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client interface to character operations */ #ifndef gschar_INCLUDED diff --git a/gs/src/gschar0.c b/gs/src/gschar0.c index 17dd31152..44f932c76 100644 --- a/gs/src/gschar0.c +++ b/gs/src/gschar0.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Composite font decoding for Ghostscript library */ #include "memory_.h" #include "gx.h" @@ -368,8 +368,11 @@ gs_type0_next_glyph(register gs_show_enum * penum, gs_char * pchr, if_debug3('J', "[J]CMap returns %d, chr=0x%lx, glyph=0x%lx\n", code, (ulong) chr, (ulong) glyph); if (code == 0) { - if (glyph == gs_no_glyph) + if (glyph == gs_no_glyph) { glyph = gs_min_cid_glyph; + if_debug0('J', "... undefined\n"); + goto done; + } } else chr = (gs_char) glyph, glyph = gs_no_glyph; /****** RESCAN chr IF DESCENDANT IS CMAP'ED ******/ @@ -382,6 +385,7 @@ gs_type0_next_glyph(register gs_show_enum * penum, gs_char * pchr, if_debug2('J', "... new depth=%d, new font=0x%lx\n", fdepth, (ulong) pfont); } +done: *pchr = chr; *pglyph = glyph; /* Update the pointer into the original string, but only if */ diff --git a/gs/src/gscie.c b/gs/src/gscie.c index 2a4db682c..d7b3c7e75 100644 --- a/gs/src/gscie.c +++ b/gs/src/gscie.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* CIE color rendering for Ghostscript */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gscie.h b/gs/src/gscie.h index dd2cc46f9..d061dd30a 100644 --- a/gs/src/gscie.h +++ b/gs/src/gscie.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Structures for CIE color algorithms */ /* (requires gscspace.h, gscolor2.h) */ diff --git a/gs/src/gscolor.c b/gs/src/gscolor.c index d6229722a..f24dc3990 100644 --- a/gs/src/gscolor.c +++ b/gs/src/gscolor.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Color and halftone operators for Ghostscript library */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gscolor.h b/gs/src/gscolor.h index a4399cadd..345d4db80 100644 --- a/gs/src/gscolor.h +++ b/gs/src/gscolor.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client interface to color routines */ #ifndef gscolor_INCLUDED diff --git a/gs/src/gscolor1.c b/gs/src/gscolor1.c index 5d58b664a..50cabbf3e 100644 --- a/gs/src/gscolor1.c +++ b/gs/src/gscolor1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Level 1 extended color operators for Ghostscript library */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gscolor1.h b/gs/src/gscolor1.h index 7d863b72b..c50c89c52 100644 --- a/gs/src/gscolor1.h +++ b/gs/src/gscolor1.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client interface to Level 1 extended color facilities */ /* Requires gscolor.h */ diff --git a/gs/src/gscolor2.c b/gs/src/gscolor2.c index 6b981c677..b56c6447c 100644 --- a/gs/src/gscolor2.c +++ b/gs/src/gscolor2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Level 2 color operators for Ghostscript library */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gscolor2.h b/gs/src/gscolor2.h index a1da5cadb..66344b3f5 100644 --- a/gs/src/gscolor2.h +++ b/gs/src/gscolor2.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client interface to Level 2 color facilities */ /* (requires gscspace.h, gsmatrix.h) */ diff --git a/gs/src/gscolor3.c b/gs/src/gscolor3.c index febef249b..664fb62ee 100644 --- a/gs/src/gscolor3.c +++ b/gs/src/gscolor3.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* "Operators" for LanguageLevel 3 color facilities */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gscolor3.h b/gs/src/gscolor3.h index 1df70952d..eea86c08b 100644 --- a/gs/src/gscolor3.h +++ b/gs/src/gscolor3.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client interface to LanguageLevel 3 color facilities */ #ifndef gscolor3_INCLUDED diff --git a/gs/src/gscompt.h b/gs/src/gscompt.h index 8799a6dc7..acd401ddf 100644 --- a/gs/src/gscompt.h +++ b/gs/src/gscompt.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Abstract types for compositing objects */ #ifndef gscompt_INCLUDED diff --git a/gs/src/gscoord.c b/gs/src/gscoord.c index f481331b1..a0bb260c5 100644 --- a/gs/src/gscoord.c +++ b/gs/src/gscoord.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Coordinate system operators for Ghostscript library */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gscoord.h b/gs/src/gscoord.h index 2416b024c..36be81e96 100644 --- a/gs/src/gscoord.h +++ b/gs/src/gscoord.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gsmatrix.h and gsstate.h */ #ifndef gscoord_INCLUDED diff --git a/gs/src/gscparam.c b/gs/src/gscparam.c index 1f90fabee..425b60937 100644 --- a/gs/src/gscparam.c +++ b/gs/src/gscparam.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Default implementation of parameter lists */ #include "memory_.h" #include "string_.h" diff --git a/gs/src/gscpixel.c b/gs/src/gscpixel.c index e28c1b844..682153058 100644 --- a/gs/src/gscpixel.c +++ b/gs/src/gscpixel.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* DevicePixel color space and operation definition */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gscpixel.h b/gs/src/gscpixel.h index 81757a3b1..a6f6c380e 100644 --- a/gs/src/gscpixel.h +++ b/gs/src/gscpixel.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gscspace.h */ #ifndef gscpixel_INCLUDED diff --git a/gs/src/gscpm.h b/gs/src/gscpm.h index 677da0f31..fac9be2ca 100644 --- a/gs/src/gscpm.h +++ b/gs/src/gscpm.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Charpath mode definitions */ #ifndef gscpm_INCLUDED diff --git a/gs/src/gscrd.c b/gs/src/gscrd.c index 67c55ba40..3a6f5a862 100644 --- a/gs/src/gscrd.c +++ b/gs/src/gscrd.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* CIE color rendering dictionary creation */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/gscrd.h b/gs/src/gscrd.h index 88d76a76a..1f12d5f47 100644 --- a/gs/src/gscrd.h +++ b/gs/src/gscrd.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface for CIE color rendering dictionary creation */ #ifndef gscrd_INCLUDED diff --git a/gs/src/gscrdp.c b/gs/src/gscrdp.c index 918c9e91a..2ef6feb4d 100644 --- a/gs/src/gscrdp.c +++ b/gs/src/gscrdp.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* CIE color rendering dictionary creation */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/gscrdp.h b/gs/src/gscrdp.h index 5603d4b5e..aa375de91 100644 --- a/gs/src/gscrdp.h +++ b/gs/src/gscrdp.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface for device-specified CRDs */ #ifndef gscrdp_INCLUDED diff --git a/gs/src/gscrypt1.h b/gs/src/gscrypt1.h index 75862d9c0..345f89594 100644 --- a/gs/src/gscrypt1.h +++ b/gs/src/gscrypt1.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to Adobe Type 1 encryption/decryption. */ #ifndef gscrypt1_INCLUDED diff --git a/gs/src/gscscie.c b/gs/src/gscscie.c index 7c49bc8a3..70bd1d19e 100644 --- a/gs/src/gscscie.c +++ b/gs/src/gscscie.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* CIE color space management */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gscsel.h b/gs/src/gscsel.h index fccf67f6a..14467ef23 100644 --- a/gs/src/gscsel.h +++ b/gs/src/gscsel.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for color operand selection */ #ifndef gscsel_INCLUDED diff --git a/gs/src/gscsepnm.h b/gs/src/gscsepnm.h index fea06afa5..f349c1e11 100644 --- a/gs/src/gscsepnm.h +++ b/gs/src/gscsepnm.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Standard color space separation names */ #ifndef gscsepnm_INCLUDED diff --git a/gs/src/gscsepr.c b/gs/src/gscsepr.c index 42cb6bef3..f75220012 100644 --- a/gs/src/gscsepr.c +++ b/gs/src/gscsepr.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Separation color space and operation definition */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gscsepr.h b/gs/src/gscsepr.h index fddca487e..00e12fbc7 100644 --- a/gs/src/gscsepr.h +++ b/gs/src/gscsepr.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client interface to Separation color */ #ifndef gscsepr_INCLUDED diff --git a/gs/src/gscspace.c b/gs/src/gscspace.c index 50c50275a..b445953fe 100644 --- a/gs/src/gscspace.c +++ b/gs/src/gscspace.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Color space operators and support */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gscspace.h b/gs/src/gscspace.h index 58836a287..1ed288220 100644 --- a/gs/src/gscspace.h +++ b/gs/src/gscspace.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client interface to color spaces */ #ifndef gscspace_INCLUDED diff --git a/gs/src/gsdcolor.h b/gs/src/gsdcolor.h index 33c8d3961..b8d70f35e 100644 --- a/gs/src/gsdcolor.h +++ b/gs/src/gsdcolor.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Device color representation for drivers */ #ifndef gsdcolor_INCLUDED diff --git a/gs/src/gsdevice.c b/gs/src/gsdevice.c index ed216d359..9e7e66075 100644 --- a/gs/src/gsdevice.c +++ b/gs/src/gsdevice.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Device operators for Ghostscript library */ #include "ctype_.h" #include "memory_.h" /* for memcpy */ diff --git a/gs/src/gsdevice.h b/gs/src/gsdevice.h index a54c9faa7..e3979a2c8 100644 --- a/gs/src/gsdevice.h +++ b/gs/src/gsdevice.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Device and page control API */ #ifndef gsdevice_INCLUDED diff --git a/gs/src/gsdevmem.c b/gs/src/gsdevmem.c index 5845598fe..15d057c70 100644 --- a/gs/src/gsdevmem.c +++ b/gs/src/gsdevmem.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Memory device creation for Ghostscript library */ #include "math_.h" /* for fabs */ #include "memory_.h" diff --git a/gs/src/gsdll.c b/gs/src/gsdll.c index a6063fe67..09716c8d9 100644 --- a/gs/src/gsdll.c +++ b/gs/src/gsdll.c @@ -18,7 +18,7 @@ /* Portions Copyright (C) 1994, 1995, 1996, Russell Lang. All rights reserved. */ -/*$Id$ */ + /* Dynamic Link Library interface for OS/2 and MS-Windows Ghostscript */ /* front end to gs.c */ diff --git a/gs/src/gsdll.h b/gs/src/gsdll.h index 1f357c7f7..858c0e071 100644 --- a/gs/src/gsdll.h +++ b/gs/src/gsdll.h @@ -17,7 +17,7 @@ */ -/*$Id$ */ + #ifndef gsdll_INCLUDED # define gsdll_INCLUDED diff --git a/gs/src/gsdll2.rc b/gs/src/gsdll2.rc index 1c028bf13..869e94b7f 100644 --- a/gs/src/gsdll2.rc +++ b/gs/src/gsdll2.rc @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Resources for gsdll2.dll, Ghostscript DLL for OS/2 */ ICON 1 gsos2.ico diff --git a/gs/src/gsdparam.c b/gs/src/gsdparam.c index deb3f7579..a0a39b577 100644 --- a/gs/src/gsdparam.c +++ b/gs/src/gsdparam.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Default device parameters for Ghostscript library */ #include "memory_.h" /* for memcpy */ #include "string_.h" /* for strlen */ diff --git a/gs/src/gsdpnext.h b/gs/src/gsdpnext.h index 27d4a61fa..883da8875 100644 --- a/gs/src/gsdpnext.h +++ b/gs/src/gsdpnext.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* API for NeXT DPS facilities */ #ifndef gsdpnext_INCLUDED diff --git a/gs/src/gsdps.c b/gs/src/gsdps.c index 334ad419b..4afbb47c3 100644 --- a/gs/src/gsdps.c +++ b/gs/src/gsdps.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Display PostScript extensions */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gsdps.h b/gs/src/gsdps.h index d2ba61b7e..fd6df1b6c 100644 --- a/gs/src/gsdps.h +++ b/gs/src/gsdps.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client interface to Display PostScript facilities. */ #ifndef gsdps_INCLUDED diff --git a/gs/src/gsdps1.c b/gs/src/gsdps1.c index 586cfb951..fe1b75a5f 100644 --- a/gs/src/gsdps1.c +++ b/gs/src/gsdps1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Display PostScript graphics additions for Ghostscript library */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gsdsc.c b/gs/src/gsdsc.c index 5405e1634..8b7c796d4 100644 --- a/gs/src/gsdsc.c +++ b/gs/src/gsdsc.c @@ -1,6 +1,6 @@ /* Copyright (C) 1994 Aladdin Enterprises. All rights reserved. */ -/*$Id$ */ + /* Parse DSC comments from a PostScript file. */ #include "stdpre.h" #include <stdio.h> diff --git a/gs/src/gsdsrc.c b/gs/src/gsdsrc.c index 6ab094cbd..da522fe51 100644 --- a/gs/src/gsdsrc.c +++ b/gs/src/gsdsrc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* DataSource procedures */ #include "memory_.h" diff --git a/gs/src/gsdsrc.h b/gs/src/gsdsrc.h index 5dd5a9de1..702a83de9 100644 --- a/gs/src/gsdsrc.h +++ b/gs/src/gsdsrc.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* DataSource definitions */ #ifndef gsdsrc_INCLUDED diff --git a/gs/src/gserror.h b/gs/src/gserror.h index ca870069c..2784fc096 100644 --- a/gs/src/gserror.h +++ b/gs/src/gserror.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Error return macros */ #ifndef gserror_INCLUDED diff --git a/gs/src/gserrors.h b/gs/src/gserrors.h index 91da1312f..ac4affa26 100644 --- a/gs/src/gserrors.h +++ b/gs/src/gserrors.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Error code definitions */ #ifndef gserrors_INCLUDED diff --git a/gs/src/gserver.c b/gs/src/gserver.c index c3e69a1a4..575735c9f 100644 --- a/gs/src/gserver.c +++ b/gs/src/gserver.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Server front end for Ghostscript, replacing gs.c. */ #include "memory_.h" #include "string_.h" diff --git a/gs/src/gsexit.h b/gs/src/gsexit.h index 2598063ca..80a726906 100644 --- a/gs/src/gsexit.h +++ b/gs/src/gsexit.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Declarations for exits */ #ifndef gsexit_INCLUDED diff --git a/gs/src/gsfcmap.c b/gs/src/gsfcmap.c index 1e329c443..a782cbd6a 100644 --- a/gs/src/gsfcmap.c +++ b/gs/src/gsfcmap.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* CMap character decoding */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gsfcmap.h b/gs/src/gsfcmap.h index 97c1f8406..8c15700d1 100644 --- a/gs/src/gsfcmap.h +++ b/gs/src/gsfcmap.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* CMap data definition */ /* Requires gsstruct.h */ diff --git a/gs/src/gsfemu.c b/gs/src/gsfemu.c index e873653df..8236aeab7 100644 --- a/gs/src/gsfemu.c +++ b/gs/src/gsfemu.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Floating point emulator for gcc */ /* We actually only need arch.h + uint and ulong, but because signal.h */ diff --git a/gs/src/gsflip.c b/gs/src/gsflip.c index 46f9f826a..21185de71 100644 --- a/gs/src/gsflip.c +++ b/gs/src/gsflip.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Routines for "flipping" image data */ #include "gx.h" #include "gsbittab.h" diff --git a/gs/src/gsflip.h b/gs/src/gsflip.h index bca3f38df..87b1bdef3 100644 --- a/gs/src/gsflip.h +++ b/gs/src/gsflip.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to routines for "flipping" image data */ #ifndef gsflip_INCLUDED diff --git a/gs/src/gsfont.c b/gs/src/gsfont.c index 62f557d4c..a6e014d7c 100644 --- a/gs/src/gsfont.c +++ b/gs/src/gsfont.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Font operators for Ghostscript library */ #include "gx.h" #include "memory_.h" diff --git a/gs/src/gsfont.h b/gs/src/gsfont.h index c66357a19..8fdefc053 100644 --- a/gs/src/gsfont.h +++ b/gs/src/gsfont.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gsmatrix.h */ #ifndef gsfont_INCLUDED diff --git a/gs/src/gsfont0.c b/gs/src/gsfont0.c index b682c584d..905e7eb95 100644 --- a/gs/src/gsfont0.c +++ b/gs/src/gsfont0.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Composite font operations for Ghostscript library */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gsfunc.c b/gs/src/gsfunc.c index d43490e53..29491d25c 100644 --- a/gs/src/gsfunc.c +++ b/gs/src/gsfunc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic Function support */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gsfunc.h b/gs/src/gsfunc.h index 73dff7214..30f3fe762 100644 --- a/gs/src/gsfunc.h +++ b/gs/src/gsfunc.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic definitions for Functions */ #ifndef gsfunc_INCLUDED diff --git a/gs/src/gsfunc0.c b/gs/src/gsfunc0.c index a5feead22..788e89e40 100644 --- a/gs/src/gsfunc0.c +++ b/gs/src/gsfunc0.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Implementation of FunctionType 0 (Sampled) Functions */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gsfunc0.h b/gs/src/gsfunc0.h index 41d68265d..1da153ebb 100644 --- a/gs/src/gsfunc0.h +++ b/gs/src/gsfunc0.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for FunctionType 0 (Sampled) Functions */ #ifndef gsfunc0_INCLUDED diff --git a/gs/src/gsfunc3.c b/gs/src/gsfunc3.c index 23b61e6b1..c8d850712 100644 --- a/gs/src/gsfunc3.c +++ b/gs/src/gsfunc3.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Implementation of LL3 Functions */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gsfunc3.h b/gs/src/gsfunc3.h index a650ff50d..5fb8ead18 100644 --- a/gs/src/gsfunc3.h +++ b/gs/src/gsfunc3.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for LL3 Functions */ #ifndef gsfunc3_INCLUDED diff --git a/gs/src/gsgc.h b/gs/src/gsgc.h index 5da840dfa..96ca59e55 100644 --- a/gs/src/gsgc.h +++ b/gs/src/gsgc.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Library-level interface to garbage collector */ /* diff --git a/gs/src/gshsb.c b/gs/src/gshsb.c index 41e29be3f..a38b61fac 100644 --- a/gs/src/gshsb.c +++ b/gs/src/gshsb.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* HSB color operators for Ghostscript library */ #include "gx.h" #include "gscolor.h" diff --git a/gs/src/gshsb.h b/gs/src/gshsb.h index dea9e14ec..c6fdd4bf2 100644 --- a/gs/src/gshsb.h +++ b/gs/src/gshsb.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client interface to HSB color routines */ #ifndef gshsb_INCLUDED diff --git a/gs/src/gsht.c b/gs/src/gsht.c index b67ff93d1..0fbeeb920 100644 --- a/gs/src/gsht.c +++ b/gs/src/gsht.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* setscreen operator for Ghostscript library */ #include "memory_.h" #include <stdlib.h> /* for qsort */ diff --git a/gs/src/gsht.h b/gs/src/gsht.h index 0a36cf35a..921c14575 100644 --- a/gs/src/gsht.h +++ b/gs/src/gsht.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Public interface to halftone functionality */ #ifndef gsht_INCLUDED diff --git a/gs/src/gsht1.c b/gs/src/gsht1.c index 0ac981182..c968ce5ca 100644 --- a/gs/src/gsht1.c +++ b/gs/src/gsht1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Extended halftone operators for Ghostscript library */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gsht1.h b/gs/src/gsht1.h index 0d265eb0f..12e89cf46 100644 --- a/gs/src/gsht1.h +++ b/gs/src/gsht1.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Extended public interface to halftones */ #ifndef gsht1_INCLUDED diff --git a/gs/src/gshtscr.c b/gs/src/gshtscr.c index 0bbe911e2..a6a2e13b6 100644 --- a/gs/src/gshtscr.c +++ b/gs/src/gshtscr.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Screen (Type 1) halftone processing for Ghostscript library */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gshtx.c b/gs/src/gshtx.c index 8275f536d..012cb3f4d 100644 --- a/gs/src/gshtx.c +++ b/gs/src/gshtx.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Stand-alone halftone/transfer function related code */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gshtx.h b/gs/src/gshtx.h index e3a3ec1e5..7d2a36cf4 100644 --- a/gs/src/gshtx.h +++ b/gs/src/gshtx.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* High-level interface to stand-alone halftone/transfer objects */ #ifndef gshtx_INCLUDED diff --git a/gs/src/gsimage.c b/gs/src/gsimage.c index 86a5f26de..9652f001c 100644 --- a/gs/src/gsimage.c +++ b/gs/src/gsimage.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Image setup procedures for Ghostscript library */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gsimage.h b/gs/src/gsimage.h index e577ac029..207eb856d 100644 --- a/gs/src/gsimage.h +++ b/gs/src/gsimage.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gsstate.h */ #ifndef gsimage_INCLUDED diff --git a/gs/src/gsimpath.c b/gs/src/gsimpath.c index d80244e73..b69930fc6 100644 --- a/gs/src/gsimpath.c +++ b/gs/src/gsimpath.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Image to outline conversion for Ghostscript library */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gsinit.c b/gs/src/gsinit.c index 66b85730a..f59f3f91b 100644 --- a/gs/src/gsinit.c +++ b/gs/src/gsinit.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Initialization for the imager */ #include "stdio_.h" #include "memory_.h" diff --git a/gs/src/gsio.h b/gs/src/gsio.h index 70c2c18e8..a6f374f7c 100644 --- a/gs/src/gsio.h +++ b/gs/src/gsio.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* stdio redirection */ #ifndef gsio_INCLUDED diff --git a/gs/src/gsiodev.c b/gs/src/gsiodev.c index 82b7a1681..2d540bfa2 100644 --- a/gs/src/gsiodev.c +++ b/gs/src/gsiodev.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* IODevice implementation for Ghostscript */ #include "errno_.h" #include "string_.h" diff --git a/gs/src/gsiparam.h b/gs/src/gsiparam.h index a048938c4..fea091470 100644 --- a/gs/src/gsiparam.h +++ b/gs/src/gsiparam.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Image parameter definition */ #ifndef gsiparam_INCLUDED diff --git a/gs/src/gsiparm2.h b/gs/src/gsiparm2.h index 8a331b4d6..a168dbfe1 100644 --- a/gs/src/gsiparm2.h +++ b/gs/src/gsiparm2.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* ImageType 2 image parameter definition */ #ifndef gsiparm2_INCLUDED diff --git a/gs/src/gsiparm3.h b/gs/src/gsiparm3.h index 221d255ca..eadc3cf7c 100644 --- a/gs/src/gsiparm3.h +++ b/gs/src/gsiparm3.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* LanguageLevel 3 (ImageType 3 & 4) image parameter definition */ #ifndef gsiparm3_INCLUDED diff --git a/gs/src/gsiparm4.h b/gs/src/gsiparm4.h index af98fb640..007174912 100644 --- a/gs/src/gsiparm4.h +++ b/gs/src/gsiparm4.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* ImageType 4 image parameter definition */ #ifndef gsiparm4_INCLUDED diff --git a/gs/src/gsjconf.h b/gs/src/gsjconf.h index c51fb02c3..6d6be0e21 100644 --- a/gs/src/gsjconf.h +++ b/gs/src/gsjconf.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* jconfig.h file for Independent JPEG Group code */ #ifndef gsjconf_INCLUDED diff --git a/gs/src/gsjmorec.h b/gs/src/gsjmorec.h index 13f529486..bc49bedfc 100644 --- a/gs/src/gsjmorec.h +++ b/gs/src/gsjmorec.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* "Wrapper" for Independent JPEG Group code jmorecfg.h */ #ifndef gsjmorec_INCLUDED diff --git a/gs/src/gslib.c b/gs/src/gslib.c index 07b9ba204..4a4e20719 100644 --- a/gs/src/gslib.c +++ b/gs/src/gslib.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Test program for Ghostscript library */ /* Capture stdin/out/err before gsio.h redefines them. */ #include "stdio_.h" diff --git a/gs/src/gslib.h b/gs/src/gslib.h index 7ef3ae816..f2dab8b7d 100644 --- a/gs/src/gslib.h +++ b/gs/src/gslib.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires stdio.h, gsmemory.h */ #ifndef gslib_INCLUDED diff --git a/gs/src/gsline.c b/gs/src/gsline.c index af3cc5659..b053fab30 100644 --- a/gs/src/gsline.c +++ b/gs/src/gsline.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Line parameter operators for Ghostscript library */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/gsline.h b/gs/src/gsline.h index 71480e6ab..594e9cc0e 100644 --- a/gs/src/gsline.h +++ b/gs/src/gsline.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Line parameter and quality definitions */ #ifndef gsline_INCLUDED diff --git a/gs/src/gslparam.h b/gs/src/gslparam.h index 35b3e285a..d6a287b36 100644 --- a/gs/src/gslparam.h +++ b/gs/src/gslparam.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Line parameter definitions */ #ifndef gslparam_INCLUDED diff --git a/gs/src/gsmalloc.c b/gs/src/gsmalloc.c index 81bd061a7..777804a4e 100644 --- a/gs/src/gsmalloc.c +++ b/gs/src/gsmalloc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* C heap allocator */ #include "malloc_.h" #include "gdebug.h" diff --git a/gs/src/gsmalloc.h b/gs/src/gsmalloc.h index d694567ff..e162254bb 100644 --- a/gs/src/gsmalloc.h +++ b/gs/src/gsmalloc.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client interface to default (C heap) allocator */ /* Requires gsmemory.h */ diff --git a/gs/src/gsmatrix.c b/gs/src/gsmatrix.c index d24fb75b4..03ca064e2 100644 --- a/gs/src/gsmatrix.c +++ b/gs/src/gsmatrix.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Matrix operators for Ghostscript library */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gsmatrix.h b/gs/src/gsmatrix.h index d93b6d5b4..0c0e99a01 100644 --- a/gs/src/gsmatrix.h +++ b/gs/src/gsmatrix.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definition of matrices and client interface to matrix routines */ #ifndef gsmatrix_INCLUDED diff --git a/gs/src/gsmdebug.h b/gs/src/gsmdebug.h index 7303923f7..052fb66fe 100644 --- a/gs/src/gsmdebug.h +++ b/gs/src/gsmdebug.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gdebug.h (for gs_debug) */ #ifndef gsmdebug_INCLUDED diff --git a/gs/src/gsmemlok.c b/gs/src/gsmemlok.c index e0e4cabbf..21cf9c629 100644 --- a/gs/src/gsmemlok.c +++ b/gs/src/gsmemlok.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Monitor-locked heap memory allocator */ /* Initial version 2/1/98 by John Desrosiers (soho@crl.com) */ diff --git a/gs/src/gsmemlok.h b/gs/src/gsmemlok.h index b176fa606..5f6a4a469 100644 --- a/gs/src/gsmemlok.h +++ b/gs/src/gsmemlok.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to monitor-locked heap memory allocator */ /* Initial version 2/1/98 by John Desrosiers (soho@crl.com) */ diff --git a/gs/src/gsmemory.c b/gs/src/gsmemory.c index ebe1ba8e1..01c133d1d 100644 --- a/gs/src/gsmemory.c +++ b/gs/src/gsmemory.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic allocator support */ #include "memory_.h" #include "gstypes.h" diff --git a/gs/src/gsmemory.h b/gs/src/gsmemory.h index 6f3827de8..5e8036ef7 100644 --- a/gs/src/gsmemory.h +++ b/gs/src/gsmemory.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client interface for memory allocation */ /* diff --git a/gs/src/gsmemraw.h b/gs/src/gsmemraw.h index 2b40d103e..26eacfded 100644 --- a/gs/src/gsmemraw.h +++ b/gs/src/gsmemraw.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client interface for "raw memory" allocator */ /* Initial version 02/03/1998 by John Desrosiers (soho@crl.com) */ diff --git a/gs/src/gsmisc.c b/gs/src/gsmisc.c index 943da5070..057b2a00c 100644 --- a/gs/src/gsmisc.c +++ b/gs/src/gsmisc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Miscellaneous utilities for Ghostscript library */ #include "ctype_.h" #include "malloc_.h" diff --git a/gs/src/gsnogc.c b/gs/src/gsnogc.c index 69e250baa..6d8c456f0 100644 --- a/gs/src/gsnogc.c +++ b/gs/src/gsnogc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* String freelist implementation and ersatz garbage collector */ #include "gx.h" #include "gsgc.h" diff --git a/gs/src/gsnorop.c b/gs/src/gsnorop.c index 6d598ef27..896e07100 100644 --- a/gs/src/gsnorop.c +++ b/gs/src/gsnorop.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Stubs for unimplemented RasterOp */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gsos2.rc b/gs/src/gsos2.rc index 14722a865..8630f022c 100644 --- a/gs/src/gsos2.rc +++ b/gs/src/gsos2.rc @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Resources for gsos2.exe, Ghostscript for OS/2 */ ICON 1 gsos2.ico diff --git a/gs/src/gspaint.c b/gs/src/gspaint.c index 3a3775a06..3ad13abeb 100644 --- a/gs/src/gspaint.c +++ b/gs/src/gspaint.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Painting procedures for Ghostscript library */ #include "math_.h" /* for fabs */ #include "gx.h" diff --git a/gs/src/gspaint.h b/gs/src/gspaint.h index 43318a92b..19e099ccf 100644 --- a/gs/src/gspaint.h +++ b/gs/src/gspaint.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gsstate.h */ #ifndef gspaint_INCLUDED diff --git a/gs/src/gsparam.c b/gs/src/gsparam.c index 3d79d7a48..f03d1673a 100644 --- a/gs/src/gsparam.c +++ b/gs/src/gsparam.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Support for parameter lists */ #include "memory_.h" #include "string_.h" diff --git a/gs/src/gsparam.h b/gs/src/gsparam.h index 06912c26e..4052e008a 100644 --- a/gs/src/gsparam.h +++ b/gs/src/gsparam.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client interface to parameter dictionaries */ #ifndef gsparam_INCLUDED diff --git a/gs/src/gsparams.c b/gs/src/gsparams.c index 2806e396f..6e40f06d6 100644 --- a/gs/src/gsparams.c +++ b/gs/src/gsparams.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic parameter list serializer & expander */ /* Initial version 2/1/98 by John Desrosiers (soho@crl.com) */ diff --git a/gs/src/gsparams.h b/gs/src/gsparams.h index 08db0e2ab..97cf4913f 100644 --- a/gs/src/gsparams.h +++ b/gs/src/gsparams.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Serializer/expander for gs_parm_list's */ #ifndef gsparams_INCLUDED diff --git a/gs/src/gspath.c b/gs/src/gspath.c index 8db6117bd..a89d88e1a 100644 --- a/gs/src/gspath.c +++ b/gs/src/gspath.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Basic path routines for Ghostscript library */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gspath.h b/gs/src/gspath.h index fc6f73155..cdd1e6423 100644 --- a/gs/src/gspath.h +++ b/gs/src/gspath.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gsstate.h */ #ifndef gspath_INCLUDED diff --git a/gs/src/gspath1.c b/gs/src/gspath1.c index cdc0b7447..a23929d83 100644 --- a/gs/src/gspath1.c +++ b/gs/src/gspath1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Additional PostScript Level 1 path routines for Ghostscript library */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gspath2.h b/gs/src/gspath2.h index 00a3dc168..7fb008184 100644 --- a/gs/src/gspath2.h +++ b/gs/src/gspath2.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gsmatrix.h */ #ifndef gspath2_INCLUDED diff --git a/gs/src/gspcolor.c b/gs/src/gspcolor.c index 45ae1b498..9b175c3a0 100644 --- a/gs/src/gspcolor.c +++ b/gs/src/gspcolor.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Pattern color operators and procedures for Ghostscript library */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gspcolor.h b/gs/src/gspcolor.h index 1b4ad8641..a0599f069 100644 --- a/gs/src/gspcolor.h +++ b/gs/src/gspcolor.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client interface to Pattern color */ #ifndef gspcolor_INCLUDED diff --git a/gs/src/gspenum.h b/gs/src/gspenum.h index 6cd66d025..b10479f5e 100644 --- a/gs/src/gspenum.h +++ b/gs/src/gspenum.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Common definitions for client interface to path enumeration */ #ifndef gspenum_INCLUDED diff --git a/gs/src/gspmdrv.c b/gs/src/gspmdrv.c index ef493298e..b9319f176 100644 --- a/gs/src/gspmdrv.c +++ b/gs/src/gspmdrv.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Presentation Manager driver for Ghostscript */ /* Written by Russell Lang */ diff --git a/gs/src/gspmdrv.h b/gs/src/gspmdrv.h index d486f933f..d80f5f52c 100644 --- a/gs/src/gspmdrv.h +++ b/gs/src/gspmdrv.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions common to gspmdrv.c and gspmdrv.rc */ #ifndef gspmdrv_INCLUDED diff --git a/gs/src/gspmdrv.rc b/gs/src/gspmdrv.rc index e4df5196f..2778f2243 100644 --- a/gs/src/gspmdrv.rc +++ b/gs/src/gspmdrv.rc @@ -16,7 +16,7 @@ all copies. */ -/*$Id$*/ + /* Resources for gspmdrv.exe, the PM display driver for Ghostscript */ #include <os2.h> diff --git a/gs/src/gsptype1.h b/gs/src/gsptype1.h index b75d387ba..51404016e 100644 --- a/gs/src/gsptype1.h +++ b/gs/src/gsptype1.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client interface to PatternType 1 Patterns */ #ifndef gsptype1_INCLUDED diff --git a/gs/src/gsptype2.h b/gs/src/gsptype2.h index e66cddd30..2959e19b4 100644 --- a/gs/src/gsptype2.h +++ b/gs/src/gsptype2.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client interface to PatternType 2 Patterns */ #ifndef gsptype2_INCLUDED diff --git a/gs/src/gsrect.h b/gs/src/gsrect.h index 9abcc66d5..dc5214844 100644 --- a/gs/src/gsrect.h +++ b/gs/src/gsrect.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Rectangle utilities */ #ifndef gsrect_INCLUDED diff --git a/gs/src/gsrefct.h b/gs/src/gsrefct.h index 81ac01f49..995b43fb6 100644 --- a/gs/src/gsrefct.h +++ b/gs/src/gsrefct.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Reference counting definitions */ #ifndef gsrefct_INCLUDED diff --git a/gs/src/gsrop.c b/gs/src/gsrop.c index c5b7fe56e..92f2cc3af 100644 --- a/gs/src/gsrop.c +++ b/gs/src/gsrop.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* RasterOp / transparency accessing for library */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gsrop.h b/gs/src/gsrop.h index cc4e3f161..8d07721a8 100644 --- a/gs/src/gsrop.h +++ b/gs/src/gsrop.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* RasterOp / transparency procedure interface */ #ifndef gsrop_INCLUDED diff --git a/gs/src/gsropc.c b/gs/src/gsropc.c index 6f86aefb2..ba1adf2c3 100644 --- a/gs/src/gsropc.c +++ b/gs/src/gsropc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* RasterOp-compositing implementation */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gsropc.h b/gs/src/gsropc.h index 3ab2c94ab..c0b4aafad 100644 --- a/gs/src/gsropc.h +++ b/gs/src/gsropc.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* RasterOp-compositing interface */ #ifndef gsropc_INCLUDED diff --git a/gs/src/gsropt.h b/gs/src/gsropt.h index 3c61881bd..5124933bc 100644 --- a/gs/src/gsropt.h +++ b/gs/src/gsropt.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* RasterOp / transparency type definitions */ #ifndef gsropt_INCLUDED diff --git a/gs/src/gsroptab.c b/gs/src/gsroptab.c index 1592b82a9..803c8aebd 100644 --- a/gs/src/gsroptab.c +++ b/gs/src/gsroptab.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Table of RasterOp procedures */ #include "stdpre.h" #include "gsropt.h" diff --git a/gs/src/gsshade.c b/gs/src/gsshade.c index 6cb455a72..cd29b693c 100644 --- a/gs/src/gsshade.c +++ b/gs/src/gsshade.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Constructors for shadings */ #include "gx.h" #include "gscspace.h" diff --git a/gs/src/gsshade.h b/gs/src/gsshade.h index 92ce450a4..44f41c4a4 100644 --- a/gs/src/gsshade.h +++ b/gs/src/gsshade.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for shading */ #ifndef gsshade_INCLUDED diff --git a/gs/src/gsstate.c b/gs/src/gsstate.c index 198c9589c..79b342c70 100644 --- a/gs/src/gsstate.c +++ b/gs/src/gsstate.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Miscellaneous graphics state operators for Ghostscript library */ #include "gx.h" #include "memory_.h" diff --git a/gs/src/gsstate.h b/gs/src/gsstate.h index afa9f043f..effc4f8b1 100644 --- a/gs/src/gsstate.h +++ b/gs/src/gsstate.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Public graphics state API */ #ifndef gsstate_INCLUDED diff --git a/gs/src/gsstruct.h b/gs/src/gsstruct.h index b97820201..58ca267ef 100644 --- a/gs/src/gsstruct.h +++ b/gs/src/gsstruct.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for Ghostscript modules that define allocatable structures */ /* Requires gstypes.h */ diff --git a/gs/src/gstext.c b/gs/src/gstext.c index 5d0777c61..b11b70de8 100644 --- a/gs/src/gstext.c +++ b/gs/src/gstext.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Driver text interface support */ #include "std.h" #include "gstypes.h" diff --git a/gs/src/gstext.h b/gs/src/gstext.h index 2a7d97a7d..46f785f15 100644 --- a/gs/src/gstext.h +++ b/gs/src/gstext.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Driver interface for text */ #ifndef gstext_INCLUDED diff --git a/gs/src/gstrap.c b/gs/src/gstrap.c index 38666f961..faaf68576 100644 --- a/gs/src/gstrap.c +++ b/gs/src/gstrap.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Setting trapping parameters and zones */ #include "string_.h" #include "gx.h" diff --git a/gs/src/gstrap.h b/gs/src/gstrap.h index 0b37615e2..f2e626f0d 100644 --- a/gs/src/gstrap.h +++ b/gs/src/gstrap.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for trapping parameters and zones */ #ifndef gstrap_INCLUDED diff --git a/gs/src/gstype1.c b/gs/src/gstype1.c index 6adf46f46..b28eae62b 100644 --- a/gs/src/gstype1.c +++ b/gs/src/gstype1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Adobe Type 1 charstring interpreter */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/gstype1.h b/gs/src/gstype1.h index 6127c9a04..e1ada2c5a 100644 --- a/gs/src/gstype1.h +++ b/gs/src/gstype1.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client interface to Adobe Type 1 font routines */ #ifndef gstype1_INCLUDED diff --git a/gs/src/gstype2.c b/gs/src/gstype2.c index 437330790..2a18c2938 100644 --- a/gs/src/gstype2.c +++ b/gs/src/gstype2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Adobe Type 2 charstring interpreter */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/gstype42.c b/gs/src/gstype42.c index 3c5031150..96bb61f0c 100644 --- a/gs/src/gstype42.c +++ b/gs/src/gstype42.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Type 42 (TrueType) font library routines */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gstypes.h b/gs/src/gstypes.h index 2c9a61568..921eef04e 100644 --- a/gs/src/gstypes.h +++ b/gs/src/gstypes.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Miscellaneous common types for Ghostscript library */ #ifndef gstypes_INCLUDED diff --git a/gs/src/gsuid.h b/gs/src/gsuid.h index acea79e22..0deb08dfd 100644 --- a/gs/src/gsuid.h +++ b/gs/src/gsuid.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Unique id definitions for Ghostscript */ #ifndef gsuid_INCLUDED diff --git a/gs/src/gsutil.c b/gs/src/gsutil.c index 8ebb27ce4..6be16261e 100644 --- a/gs/src/gsutil.c +++ b/gs/src/gsutil.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Utilities for Ghostscript library */ #include "string_.h" #include "memory_.h" diff --git a/gs/src/gsutil.h b/gs/src/gsutil.h index 572748f78..45490519d 100644 --- a/gs/src/gsutil.h +++ b/gs/src/gsutil.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Prototypes for procedures in gsutil.c */ #ifndef gsutil_INCLUDED diff --git a/gs/src/gswin.rc b/gs/src/gswin.rc index 73be58298..ca7d15013 100644 --- a/gs/src/gswin.rc +++ b/gs/src/gswin.rc @@ -17,7 +17,7 @@ */ -/*$Id$*/ + #include <windows.h> #include "dwmain.h" diff --git a/gs/src/gsxfont.h b/gs/src/gsxfont.h index be5bd87f5..b6d6bdc36 100644 --- a/gs/src/gsxfont.h +++ b/gs/src/gsxfont.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* External font client definitions for Ghostscript library */ #ifndef gsxfont_INCLUDED diff --git a/gs/src/gx.h b/gs/src/gx.h index 8de7e06c4..1ec7f6a2f 100644 --- a/gs/src/gx.h +++ b/gs/src/gx.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Common internal definitions for Ghostscript library */ #ifndef gx_INCLUDED diff --git a/gs/src/gxacpath.c b/gs/src/gxacpath.c index 73df69a27..a598dcc4b 100644 --- a/gs/src/gxacpath.c +++ b/gs/src/gxacpath.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Accumulator for clipping paths */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gxalloc.h b/gs/src/gxalloc.h index c8e18453e..1b681bfae 100644 --- a/gs/src/gxalloc.h +++ b/gs/src/gxalloc.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gsmemory.h, gsstruct.h */ #ifndef gxalloc_INCLUDED diff --git a/gs/src/gxalpha.h b/gs/src/gxalpha.h index 27b8f6a3b..43d649e65 100644 --- a/gs/src/gxalpha.h +++ b/gs/src/gxalpha.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal machinery for alpha channel support */ #ifndef gxalpha_INCLUDED diff --git a/gs/src/gxarith.h b/gs/src/gxarith.h index 4273999c9..37e55df8c 100644 --- a/gs/src/gxarith.h +++ b/gs/src/gxarith.h @@ -19,7 +19,7 @@ #ifndef gxarith_INCLUDED # define gxarith_INCLUDED -/*$Id$ */ + /* Arithmetic macros for Ghostscript library */ /* Define an in-line abs function, good for any signed numeric type. */ diff --git a/gs/src/gxband.h b/gs/src/gxband.h index 41d10ab7f..87aba07ec 100644 --- a/gs/src/gxband.h +++ b/gs/src/gxband.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Band-processing parameters for Ghostscript */ #ifndef gxband_INCLUDED diff --git a/gs/src/gxbcache.c b/gs/src/gxbcache.c index 036cff9b5..438eb9c5e 100644 --- a/gs/src/gxbcache.c +++ b/gs/src/gxbcache.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Bitmap cache implementation */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gxbcache.h b/gs/src/gxbcache.h index 1e7128816..629df0064 100644 --- a/gs/src/gxbcache.h +++ b/gs/src/gxbcache.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Bitmap cache structures */ #ifndef gxbcache_INCLUDED diff --git a/gs/src/gxbitfmt.h b/gs/src/gxbitfmt.h index 0106dfa2a..b09afa754 100644 --- a/gs/src/gxbitfmt.h +++ b/gs/src/gxbitfmt.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for bitmap storage formats */ #ifndef gxbitfmt_INCLUDED diff --git a/gs/src/gxbitmap.h b/gs/src/gxbitmap.h index 784e6b0aa..b644b0ffe 100644 --- a/gs/src/gxbitmap.h +++ b/gs/src/gxbitmap.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for stored bitmaps for Ghostscript */ #ifndef gxbitmap_INCLUDED diff --git a/gs/src/gxbitops.h b/gs/src/gxbitops.h index 55e79ffa4..ac6827130 100644 --- a/gs/src/gxbitops.h +++ b/gs/src/gxbitops.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal definitions for bitmap operations */ #ifndef gxbitops_INCLUDED diff --git a/gs/src/gxccache.c b/gs/src/gxccache.c index c48126cfa..960f45b8e 100644 --- a/gs/src/gxccache.c +++ b/gs/src/gxccache.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Fast case character cache routines for Ghostscript library */ #include "gx.h" #include "gpcheck.h" diff --git a/gs/src/gxccman.c b/gs/src/gxccman.c index 155bfffa2..11bcc60fe 100644 --- a/gs/src/gxccman.c +++ b/gs/src/gxccman.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Character cache management routines for Ghostscript library */ #include "gx.h" #include "memory_.h" diff --git a/gs/src/gxchar.h b/gs/src/gxchar.h index f825db2d3..6b1c3951a 100644 --- a/gs/src/gxchar.h +++ b/gs/src/gxchar.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal character definition for Ghostscript library */ /* Requires gsmatrix.h, gxfixed.h */ diff --git a/gs/src/gxcht.c b/gs/src/gxcht.c index 880ec4f9a..ff0ab1ce5 100644 --- a/gs/src/gxcht.c +++ b/gs/src/gxcht.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Color halftone rendering for Ghostscript imaging library */ #include "memory_.h" #include "gx.h" @@ -140,12 +140,13 @@ gx_dc_ht_colored_fill_rectangle(const gx_device_color * pdevc, int x, int y, /* let tile_rectangle do the replication. */ if ((w > lw || h > lh) && (raster = bitmap_raster(lw * depth)) <= tile_bytes / lh - ) { /* - * The only reason we need to do fit_fill here is that if the - * device is a clipper, the caller might be counting on it to do - * all necessary clipping. Actually, we should clip against the - * device's clipping box, not the default.... - */ + ) { + /* + * The only reason we need to do fit_fill here is that if the + * device is a clipper, the caller might be counting on it to do + * all necessary clipping. Actually, we should clip against the + * device's clipping box, not the default.... + */ fit_fill(dev, x, y, w, h); /* Check to make sure we still have a big rectangle. */ if (w > lw || h > lh) { @@ -177,10 +178,11 @@ gx_dc_ht_colored_fill_rectangle(const gx_device_color * pdevc, int x, int y, tiles.id = gx_no_bitmap_id; size_x = w * depth; raster = bitmap_raster(size_x); - if (raster > tile_bytes) { /* - * We can't even do an entire line at once. See above for - * why we do the X equivalent of fit_fill here. - */ + if (raster > tile_bytes) { + /* + * We can't even do an entire line at once. See above for + * why we do the X equivalent of fit_fill here. + */ if (x < 0) w += x, x = 0; if (x > dev->width - w) @@ -210,11 +212,14 @@ gx_dc_ht_colored_fill_rectangle(const gx_device_color * pdevc, int x, int y, int cy = y, ch = dh, left = h; tiles.rep_height = tiles.size.y = ch; - for (;;) { /* The cast in the following statement is bogus, */ - /* but some compilers won't accept an array type, */ - /* and won't accept the ** type without a cast. */ - set_color_ht(&tiles, x, cy, dw, ch, - depth, nplanes, colors, + for (;;) { + /* + * The cast in the following statement is bogus, + * but some compilers won't accept an array type, + * and won't accept the ** type without a cast. + */ + set_color_ht(&tiles, x + pdevc->phase.x, cy + pdevc->phase.y, + dw, ch, depth, nplanes, colors, (const gx_strip_bitmap **)sbits); if (source == NULL && lop_no_S_is_T(lop)) { code = (*dev_proc(dev, copy_color)) (dev, @@ -229,8 +234,7 @@ gx_dc_ht_colored_fill_rectangle(const gx_device_color * pdevc, int x, int y, (source->use_scolors ? source->scolors : NULL), &tiles, NULL, x, cy, dw, ch, - pdevc->phase.x, pdevc->phase.y, - lop); + 0, 0, lop); } if (code < 0) return code; diff --git a/gs/src/gxcindex.h b/gs/src/gxcindex.h index de9da6d44..8c63143ae 100644 --- a/gs/src/gxcindex.h +++ b/gs/src/gxcindex.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Define the device color index type and macros */ #ifndef gxcindex_INCLUDED diff --git a/gs/src/gxclbits.c b/gs/src/gxclbits.c index 5188df3ff..f370a1a54 100644 --- a/gs/src/gxclbits.c +++ b/gs/src/gxclbits.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Halftone and bitmap writing for command lists */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gxcldev.h b/gs/src/gxcldev.h index c5c48361c..e9c1e2527 100644 --- a/gs/src/gxcldev.h +++ b/gs/src/gxcldev.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal definitions for Ghostscript command lists. */ #ifndef gxcldev_INCLUDED diff --git a/gs/src/gxclfile.c b/gs/src/gxclfile.c index 5f88365a3..855bcdf9c 100644 --- a/gs/src/gxclfile.c +++ b/gs/src/gxclfile.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* File-based command list implementation */ #include "stdio_.h" #include "string_.h" diff --git a/gs/src/gxclimag.c b/gs/src/gxclimag.c index 31969ea14..d899f4583 100644 --- a/gs/src/gxclimag.c +++ b/gs/src/gxclimag.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Higher-level image operations for band lists */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/gxclio.h b/gs/src/gxclio.h index 4ddb1c4e4..a386313c3 100644 --- a/gs/src/gxclio.h +++ b/gs/src/gxclio.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* I/O interface for command lists */ #ifndef gxclio_INCLUDED diff --git a/gs/src/gxclip.c b/gs/src/gxclip.c index 056286b42..e4718340d 100644 --- a/gs/src/gxclip.c +++ b/gs/src/gxclip.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Implementation of (path-based) clipping */ #include "gx.h" #include "gxdevice.h" diff --git a/gs/src/gxclip.h b/gs/src/gxclip.h index d97d48366..53d4fdafa 100644 --- a/gs/src/gxclip.h +++ b/gs/src/gxclip.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal definitions for clipping */ #ifndef gxclip_INCLUDED diff --git a/gs/src/gxclip2.c b/gs/src/gxclip2.c index d4da1bd54..8897ee4d4 100644 --- a/gs/src/gxclip2.c +++ b/gs/src/gxclip2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Mask clipping for patterns */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gxclip2.h b/gs/src/gxclip2.h index fe3bb6544..edfd579d6 100644 --- a/gs/src/gxclip2.h +++ b/gs/src/gxclip2.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Tiled mask clipping device and interface */ #ifndef gxclip2_INCLUDED diff --git a/gs/src/gxclipm.c b/gs/src/gxclipm.c index c328d5fed..fd96f0044 100644 --- a/gs/src/gxclipm.c +++ b/gs/src/gxclipm.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Mask clipping device */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gxclipm.h b/gs/src/gxclipm.h index df412da85..f24778786 100644 --- a/gs/src/gxclipm.h +++ b/gs/src/gxclipm.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gsstruct.h, gxdevice.h, gxdevmem.h */ #ifndef gxclipm_INCLUDED diff --git a/gs/src/gxclist.c b/gs/src/gxclist.c index 79b2cc79e..e18babe8b 100644 --- a/gs/src/gxclist.c +++ b/gs/src/gxclist.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Command list document- and page-level code. */ #include "memory_.h" #include "string_.h" diff --git a/gs/src/gxclist.h b/gs/src/gxclist.h index 8cc388df9..5104a3392 100644 --- a/gs/src/gxclist.h +++ b/gs/src/gxclist.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Command list definitions for Ghostscript. */ /* Requires gxdevice.h and gxdevmem.h */ diff --git a/gs/src/gxcllzw.c b/gs/src/gxcllzw.c index 1db2534d2..48ec72ea3 100644 --- a/gs/src/gxcllzw.c +++ b/gs/src/gxcllzw.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* LZW filter initialization for RAM-based band lists */ #include "std.h" #include "gstypes.h" diff --git a/gs/src/gxclmem.c b/gs/src/gxclmem.c index 33f06acd0..6f19e7a41 100644 --- a/gs/src/gxclmem.c +++ b/gs/src/gxclmem.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* RAM-based command list implementation */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gxclmem.h b/gs/src/gxclmem.h index c5b34c43f..38283d291 100644 --- a/gs/src/gxclmem.h +++ b/gs/src/gxclmem.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions and declarations for clist implementation in memory. */ #ifndef gxclmem_INCLUDED diff --git a/gs/src/gxclpage.c b/gs/src/gxclpage.c index 9d9fdc076..02f03f5fe 100644 --- a/gs/src/gxclpage.c +++ b/gs/src/gxclpage.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Page object management */ #include "gdevprn.h" #include "gxcldev.h" diff --git a/gs/src/gxclpage.h b/gs/src/gxclpage.h index a63197e93..4a12d1427 100644 --- a/gs/src/gxclpage.h +++ b/gs/src/gxclpage.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gdevprn.h, gxclist.h */ #ifndef gxclpage_INCLUDED diff --git a/gs/src/gxclpath.c b/gs/src/gxclpath.c index d5c3ae524..629e4ef27 100644 --- a/gs/src/gxclpath.c +++ b/gs/src/gxclpath.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Higher-level path operations for band lists */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/gxclpath.h b/gs/src/gxclpath.h index 7d64524b7..de2ee6802 100644 --- a/gs/src/gxclpath.h +++ b/gs/src/gxclpath.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Extends (requires) gxcldev.h */ #ifndef gxclpath_INCLUDED diff --git a/gs/src/gxclrast.c b/gs/src/gxclrast.c index 09bbf6e28..9acb80990 100644 --- a/gs/src/gxclrast.c +++ b/gs/src/gxclrast.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Command list interpreter/rasterizer */ #include "memory_.h" #include "gx.h" @@ -90,13 +90,14 @@ cmd_get_w(const byte * p, const byte ** rp) /* * Define the structure for keeping track of the command reading buffer. * - * The ptr member is not used, since normally we want it kept in a - * register. + * The ptr member is only used for passing the current pointer to, and + * receiving an updated pointer from, commands implemented as separate + * procedures: normally it is kept in a register. */ typedef struct command_buf_s { byte *data; /* actual buffer, guaranteed aligned */ uint size; - /*const byte *ptr;*/ /* next byte to be read (see above) */ + const byte *ptr; /* next byte to be read (see above) */ const byte *limit; /* refill warning point */ const byte *end; /* byte just beyond valid data */ stream *s; /* for refilling buffer */ @@ -149,22 +150,55 @@ cmd_read_data(command_buf_t *pcb, byte *ptr, uint rsize, const byte *cbp) return pcb->end; } } +#define cmd_read(ptr, rsize, cbp)\ + cbp = cmd_read_data(&cbuf, ptr, rsize, cbp) + +/* Read a fixed-size value from the command buffer. */ +inline private const byte * +cmd_copy_value(void *pvar, int var_size, const byte *cbp) +{ + memcpy(pvar, cbp, var_size); + return cbp + var_size; +} +#define cmd_get_value(var, cbp)\ + cbp = cmd_copy_value(&var, sizeof(var), cbp) /* * Render one band to a specified target device. Note that if * action == setup, target may be 0. */ +private int read_set_tile_size(P2(command_buf_t *pcb, tile_slot *bits)); +private int read_set_bits(P8(command_buf_t *pcb, tile_slot *bits, + int compress, gx_clist_state *pcls, + gx_strip_bitmap *tile, tile_slot **pslot, + gx_device_clist_reader *cdev, gs_memory_t *mem)); +private int read_set_ht_order(P4(command_buf_t *pcb, gx_device_halftone *pdht, + gx_ht_order **pporder, gs_memory_t *mem)); +private int read_set_ht_data(P8(command_buf_t *pcb, uint *pdata_index, + gx_ht_order *porder, gx_device_halftone *pdht, + gs_halftone_type halftone_type, + gs_imager_state *pis, + gx_device_clist_reader *cdev, + gs_memory_t *mem)); +private int read_begin_image(P5(command_buf_t *pcb, gs_image_t *pim, + int *pnum_planes, gs_int_rect *prect, + const gs_color_space *pcs)); +private int read_put_params(P3(command_buf_t *pcb, + gx_device_clist_reader *cdev, + gs_memory_t *mem)); + private const byte *cmd_read_rect(P3(int, gx_cmd_rect *, const byte *)); private const byte *cmd_read_matrix(P2(gs_matrix *, const byte *)); -private void clist_unpack_short_bits(P5(byte *, const byte *, int, int, uint)); +private const byte *cmd_read_short_bits(P6(command_buf_t *pcb, byte *data, + int width_bytes, int height, + uint raster, const byte *cbp)); private int cmd_select_map(P7(cmd_map_index, bool, gs_imager_state *, gx_ht_order *, frac **, uint *, gs_memory_t *)); private int cmd_resize_halftone(P3(gx_device_halftone *, uint, gs_memory_t *)); -private int cmd_install_ht_order(P3(gx_ht_order *, const gx_ht_order *, - gs_memory_t *)); private int clist_decode_segment(P7(gx_path *, int, fixed[6], gs_fixed_point *, int, int, segment_notes)); + int clist_playback_band(clist_playback_action playback_action, gx_device_clist_reader *cdev, stream *s, @@ -219,15 +253,6 @@ clist_playback_band(clist_playback_action playback_action, int data_x; int code = 0; -#define cmd_get_value(var, cbp)\ - memcpy(&var, cbp, sizeof(var));\ - cbp += sizeof(var) -#define cmd_read(ptr, rsize, cbp)\ - cbp = cmd_read_data(&cbuf, ptr, rsize, cbp) -#define cmd_read_short_bits(ptr, bw, ht, ras, cbp)\ - cbp = cmd_read_data(&cbuf, ptr, (bw) * (ht), cbp);\ - clist_unpack_short_bits(ptr, ptr, bw, ht, ras) - cbuf.data = (byte *)cbuf_storage; cbuf.size = cbuf_size; cbuf.s = s; @@ -248,7 +273,8 @@ in: /* Initialize for a new page. */ } state_tile.id = gx_no_bitmap_id; state_tile.shift = state_tile.rep_shift = 0; - tile_phase.x = tile_phase.y = 0; + tile_phase.x = x0; + tile_phase.y = y0; gx_path_init_local(&path, mem); in_path = false; /* @@ -331,46 +357,11 @@ in: /* Initialize for a new page. */ if_debug0('L', "\n"); continue; case cmd_opv_set_tile_size: - { - uint rep_width, rep_height; - byte bd = *cbp++; - - tile_bits.cb_depth = (bd & 31) + 1; - cmd_getw(rep_width, cbp); - cmd_getw(rep_height, cbp); - if (bd & 0x20) { - cmd_getw(tile_bits.x_reps, cbp); - tile_bits.width = - rep_width * tile_bits.x_reps; - } else { - tile_bits.x_reps = 1, - tile_bits.width = rep_width; - } - if (bd & 0x40) { - cmd_getw(tile_bits.y_reps, cbp); - tile_bits.height = - rep_height * tile_bits.y_reps; - } else { - tile_bits.y_reps = 1, - tile_bits.height = rep_height; - } - if (bd & 0x80) - cmd_getw(tile_bits.rep_shift, cbp); - else - tile_bits.rep_shift = 0; - if_debug6('L', " depth=%d size=(%d,%d), rep_size=(%d,%d), rep_shift=%d\n", - tile_bits.cb_depth, tile_bits.width, - tile_bits.height, rep_width, - rep_height, tile_bits.rep_shift); - tile_bits.shift = - (tile_bits.rep_shift == 0 ? 0 : - (tile_bits.rep_shift * - (tile_bits.height / rep_height)) - % rep_width); - tile_bits.cb_raster = - bitmap_raster(tile_bits.width * - tile_bits.cb_depth); - } + cbuf.ptr = cbp; + code = read_set_tile_size(&cbuf, &tile_bits); + cbp = cbuf.ptr; + if (code < 0) + goto out; continue; case cmd_opv_set_tile_phase: cmd_getw(state.tile_phase.x, cbp); @@ -382,114 +373,14 @@ in: /* Initialize for a new page. */ case cmd_opv_set_tile_bits: bits = tile_bits; compress = 0; - stb:{ - uint rep_width = bits.width / bits.x_reps; - uint rep_height = bits.height / bits.y_reps; - uint index; - ulong offset; - uint width_bits = rep_width * bits.cb_depth; - uint width_bytes; - uint bytes = - clist_bitmap_bytes(width_bits, rep_height, - compress | - (rep_width < bits.width ? - decompress_spread : 0) | - decompress_elsewhere, - &width_bytes, - (uint *) & raster); - byte *data; - - cmd_getw(index, cbp); - cmd_getw(offset, cbp); - if_debug2('L', " index=%d offset=%lu\n", - state.tile_index, offset); - state.tile_index = index; - cdev->tile_table[state.tile_index].offset = - offset; - state_slot = - (tile_slot *) (cdev->chunk.data + offset); - *state_slot = bits; - state_tile.data = data = - (byte *) (state_slot + 1); -#ifdef DEBUG - state_slot->index = state.tile_index; -#endif - if (compress) { /* Decompress the image data. */ - /* We'd like to share this code */ - /* with the similar code in copy_*, */ - /* but right now we don't see how. */ - stream_cursor_read r; - stream_cursor_write w; - - /* We don't know the data length a */ - /* priori, so to be conservative, */ - /* we read the uncompressed size. */ - uint cleft = cbuf.end - cbp; - - if (cleft < bytes) { - uint nread = cbuf_size - cleft; - - memmove(cbuf.data, cbp, cleft); - cbuf.end_status = sgets(s, cbuf.data + cleft, nread, &nread); - set_cb_end(&cbuf, cbuf.data + cleft + nread); - cbp = cbuf.data; - } - r.ptr = cbp - 1; - r.limit = cbuf.end - 1; - w.ptr = data - 1; - w.limit = w.ptr + bytes; - switch (compress) { - case cmd_compress_rle: - { - stream_RLD_state sstate; - - clist_rld_init(&sstate); - (*s_RLD_template.process) - ((stream_state *) & sstate, &r, &w, true); - } - break; - case cmd_compress_cfe: - { - stream_CFD_state sstate; - - clist_cfd_init(&sstate, - width_bytes << 3 /*width_bits */ , - rep_height, mem); - (*s_CFD_template.process) - ((stream_state *) & sstate, &r, &w, true); - (*s_CFD_template.release) - ((stream_state *) & sstate); - } - break; - default: - goto bad_op; - } - cbp = r.ptr + 1; - } else if (rep_height > 1 && - width_bytes != bits.cb_raster - ) { - cmd_read_short_bits(data, width_bytes, - rep_height, bits.cb_raster, cbp); - } else { - cmd_read(data, bytes, cbp); - } - if (bits.width > rep_width) - bits_replicate_horizontally(data, - rep_width * bits.cb_depth, rep_height, - bits.cb_raster, - bits.width * bits.cb_depth, - bits.cb_raster); - if (bits.height > rep_height) - bits_replicate_vertically(data, - rep_height, bits.cb_raster, - bits.height); -#ifdef DEBUG - if (gs_debug_c('L')) - cmd_print_bits(data, bits.width, - bits.height, - bits.cb_raster); -#endif - } + stb: + cbuf.ptr = cbp; + code = read_set_bits(&cbuf, &bits, compress, + &state, &state_tile, &state_slot, + cdev, mem); + cbp = cbuf.ptr; + if (code < 0) + goto out; goto stp; case cmd_opv_set_bits: compress = *cbp & 3; @@ -591,139 +482,35 @@ in: /* Initialize for a new page. */ if_debug0('L', "\n"); continue; case cmd_opv_set_ht_order: - { - int index; - gx_ht_order order; - - cmd_getw(index, cbp); - if (index == 0) - porder = &dev_ht.order; - else { - gx_ht_order_component *pcomp = - &dev_ht.components[index - 1]; - - cmd_getw(pcomp->cname, cbp); - if_debug1('L', " cname=%lu", - (ulong) pcomp->cname); - porder = &pcomp->corder; - } - order = *porder; - cmd_getw(order.width, cbp); - cmd_getw(order.height, cbp); - cmd_getw(order.raster, cbp); - cmd_getw(order.shift, cbp); - cmd_getw(order.num_levels, cbp); - cmd_getw(order.num_bits, cbp); - if_debug7('L', " index=%d size=(%d,%d) raster=%d shift=%d num_levels=%d num_bits=%d\n", - index, order.width, order.height, - order.raster, order.shift, - order.num_levels, order.num_bits); - code = - cmd_install_ht_order(porder, &order, mem); - if (code < 0) - goto out; - } + cbuf.ptr = cbp; + code = read_set_ht_order(&cbuf, &dev_ht, &porder, mem); + cbp = cbuf.ptr; + if (code < 0) + goto out; ht_data_index = 0; - continue; - case cmd_opv_set_ht_data: + /* + * Free the relevant cache, because its sizes + * are probably not correct any more. + */ { - int n = *cbp++; + gx_ht_cache *pcache = porder->cache; - if (ht_data_index < porder->num_levels) { /* Setting levels */ - byte *lptr = (byte *) - (porder->levels + ht_data_index); - - cmd_read(lptr, n * sizeof(*porder->levels), - cbp); -#ifdef DEBUG - if (gs_debug_c('L')) { - int i; - - dprintf1(" levels[%u]", ht_data_index); - for (i = 0; i < n; ++i) - dprintf1(" %u", - porder->levels[ht_data_index + i]); - dputc('\n'); - } -#endif - } else { /* Setting bits */ - byte *bptr = (byte *) - (porder->bits + - (ht_data_index - porder->num_levels)); - - cmd_read(bptr, n * sizeof(*porder->bits), - cbp); -#ifdef DEBUG - if (gs_debug_c('L')) { - int i; - - dprintf1(" bits[%u]", ht_data_index - porder->num_levels); - for (i = 0; i < n; ++i) { - const gx_ht_bit *pb = - &porder->bits[ht_data_index - porder->num_levels + i]; - - dprintf2(" (%u,0x%lx)", - pb->offset, - (ulong) pb->mask); - } - dputc('\n'); - } -#endif - } - ht_data_index += n; - } - /* If this is the end of the data, */ - /* install the (device) halftone. */ - if (porder == - (dev_ht.components != 0 ? - &dev_ht.components[0].corder : - &dev_ht.order) && - ht_data_index == porder->num_levels + - porder->num_bits - ) { /* Make sure we have a halftone cache. */ - uint i; - - if (imager_state.ht_cache == 0) { - gx_ht_cache *pcache = - gx_ht_alloc_cache(mem, - porder->num_levels + 2, - gx_ht_cache_default_bits()); - - if (pcache == 0) { - code = gs_note_error(gs_error_VMerror); - goto out; - } - imager_state.ht_cache = pcache; + if (pcache) { + if (pcache != imager_state.ht_cache) + gx_ht_free_cache(mem, pcache); + porder->cache = 0; } - for (i = 1; i < dev_ht.num_comp; ++i) { - gx_ht_order *pco = - &dev_ht.components[i].corder; - - if (!pco->cache) { - gx_ht_cache *pcache = - gx_ht_alloc_cache(mem, 1, - pco->raster * (pco->num_bits / - pco->width)); - - if (pcache == 0) { - code = gs_note_error(gs_error_VMerror); - goto out; - } - pco->cache = pcache; - gx_ht_init_cache(pcache, pco); - } - } - if (dev_ht.num_comp) { - dev_ht.components[0].corder.cache = - imager_state.ht_cache; - dev_ht.order = - dev_ht.components[0].corder; - } - gx_imager_dev_ht_install(&imager_state, - &dev_ht, halftone_type, - (const gx_device *)cdev); } continue; + case cmd_opv_set_ht_data: + cbuf.ptr = cbp; + code = read_set_ht_data(&cbuf, &ht_data_index, porder, + &dev_ht, halftone_type, + &imager_state, cdev, mem); + cbp = cbuf.ptr; + if (code < 0) + goto out; + continue; case cmd_opv_end_page: if_debug0('L', "\n"); /* @@ -892,7 +679,7 @@ in: /* Initialize for a new page. */ clist_bitmap_bytes(width_bits, state.rect.height, op & 3, &width_bytes, - (uint *) & raster); + (uint *)&raster); /* copy_mono and copy_color/alpha */ /* ensure that the bits will fit in a single buffer, */ /* even after decompression if compressed. */ @@ -936,7 +723,7 @@ in: /* Initialize for a new page. */ clist_rld_init(&sstate); /* The process procedure can't fail. */ (*s_RLD_template.process) - ((stream_state *) & sstate, &r, &w, true); + ((stream_state *)&sstate, &r, &w, true); } break; case cmd_compress_cfe: @@ -948,9 +735,9 @@ in: /* Initialize for a new page. */ state.rect.height, mem); /* The process procedure can't fail. */ (*s_CFD_template.process) - ((stream_state *) & sstate, &r, &w, true); + ((stream_state *)&sstate, &r, &w, true); (*s_CFD_template.release) - ((stream_state *) & sstate); + ((stream_state *)&sstate); } break; default: @@ -962,9 +749,9 @@ in: /* Initialize for a new page. */ width_bytes != raster ) { source = data_bits; - cmd_read_short_bits(source, width_bytes, - state.rect.height, - raster, cbp); + cbp = cmd_read_short_bits(&cbuf, source, width_bytes, + state.rect.height, + raster, cbp); } else { cmd_read(cbuf.data, bytes, cbp); source = cbuf.data; @@ -1159,7 +946,7 @@ in: /* Initialize for a new page. */ gx_cpath_accum_begin(&clip_accum, mem); gx_cpath_accum_set_cbox(&clip_accum, &target_box); - tdev = (gx_device *) & clip_accum; + tdev = (gx_device *)&clip_accum; clip_save.lop_enabled = state.lop_enabled; clip_save.fill_adjust = imager_state.fill_adjust; @@ -1231,153 +1018,19 @@ in: /* Initialize for a new page. */ } break; case cmd_opv_begin_image: + cbuf.ptr = cbp; + code = read_begin_image(&cbuf, &image, + &image_num_planes, + &image_rect, pcs); + cbp = cbuf.ptr; + if (code < 0) + goto out; { - byte b = *cbp++; - int bpci = b >> 5; - static const byte bpc[6] = - {1, 1, 2, 4, 8, 12}; gx_drawing_color devc; - int num_components; - gs_image_format_t format; - if (bpci == 0) - gs_image_t_init_mask(&image, false); - else - gs_image_t_init(&image, pcs); - if (b & (1 << 4)) { - byte b2 = *cbp++; - - format = b2 >> 6; - image.Interpolate = (b2 & (1 << 5)) != 0; - image.Alpha = - (gs_image_alpha_t) ((b2 >> 3) & 3); - } else { - format = gs_image_format_chunky; - } - cmd_getw(image.Width, cbp); - cmd_getw(image.Height, cbp); - if_debug4('L', " BPCi=%d I=%d size=(%d,%d)", - bpci, (b & 0x10) != 0, - image.Width, image.Height); - if (b & (1 << 3)) { /* Non-standard ImageMatrix */ - cbp = cmd_read_matrix( - &image.ImageMatrix, cbp); - if_debug6('L', " matrix=[%g %g %g %g %g %g]", - image.ImageMatrix.xx, - image.ImageMatrix.xy, - image.ImageMatrix.yx, - image.ImageMatrix.yy, - image.ImageMatrix.tx, - image.ImageMatrix.ty); - } else { - image.ImageMatrix.xx = image.Width; - image.ImageMatrix.xy = 0; - image.ImageMatrix.yx = 0; - image.ImageMatrix.yy = -image.Height; - image.ImageMatrix.tx = 0; - image.ImageMatrix.ty = image.Height; - } - image.BitsPerComponent = bpc[bpci]; - if (bpci == 0) { - num_components = 1; - } else { - image.ColorSpace = pcs; - if (gs_color_space_get_index(pcs) == gs_color_space_index_Indexed) { - image.Decode[0] = 0; - image.Decode[1] = - (1 << image.BitsPerComponent) - 1; - } else { - static const float decode01[] = - { - 0, 1, 0, 1, 0, 1, 0, 1, 0, 1 - }; - - memcpy(image.Decode, decode01, - sizeof(image.Decode)); - } - num_components = - gs_color_space_num_components(pcs); - } - switch (format) { - case gs_image_format_chunky: - image_num_planes = 1; - break; - case gs_image_format_component_planar: - image_num_planes = num_components; - break; - case gs_image_format_bit_planar: - image_num_planes = num_components * - image.BitsPerComponent; - break; - default: - goto bad_op; - } - if (b & (1 << 2)) { /* Non-standard Decode */ - byte dflags = *cbp++; - int i; - - for (i = 0; i < num_components * 2; - dflags <<= 2, i += 2 - ) - switch ((dflags >> 6) & 3) { - case 0: /* default */ - break; - case 1: /* swapped default */ - image.Decode[i] = - image.Decode[i + 1]; - image.Decode[i + 1] = 0; - break; - case 3: - cmd_get_value(image.Decode[i], - cbp); - /* falls through */ - case 2: - cmd_get_value(image.Decode[i + 1], - cbp); - } -#ifdef DEBUG - if (gs_debug_c('L')) { - dputs(" decode=["); - for (i = 0; i < num_components * 2; - ++i - ) - dprintf1("%g ", image.Decode[i]); - dputc(']'); - } -#endif - } - image.adjust = false; - if (b & (1 << 1)) { - if (image.ImageMask) - image.adjust = true; - else - image.CombineWithColor = true; - if_debug1('L', " %s", - (image.ImageMask ? " adjust" : - " CWC")); - } - if (b & (1 << 0)) { /* Non-standard rectangle */ - uint diff; - - cmd_getw(image_rect.p.x, cbp); - cmd_getw(image_rect.p.y, cbp); - cmd_getw(diff, cbp); - image_rect.q.x = image.Width - diff; - cmd_getw(diff, cbp); - image_rect.q.y = image.Height - diff; - if_debug4('L', " rect=(%d,%d),(%d,%d)", - image_rect.p.x, image_rect.p.y, - image_rect.q.x, image_rect.q.y); - } else { - image_rect.p.x = 0; - image_rect.p.y = 0; - image_rect.q.x = image.Width; - image_rect.q.y = image.Height; - } - if_debug0('L', "\n"); color_set_pure(&devc, state.colors[1]); code = (*dev_proc(tdev, begin_image)) - (tdev, &imager_state, &image, format, + (tdev, &imager_state, &image, image.format, &image_rect, &devc, pcpath, mem, &image_info); if (code < 0) @@ -1497,70 +1150,16 @@ in: /* Initialize for a new page. */ #undef dcl } continue; - case cmd_opv_put_params: { - gs_c_param_list param_list; - uint cleft; - uint rleft; - bool alloc_data_on_heap = false; - byte *param_buf; - uint param_length; - - cmd_get_value(param_length, cbp); - if_debug1('L', " length=%d\n", param_length); - code = 0; - if (param_length == 0) - break; - - /* Make sure entire serialized param list is in cbuf */ - /* + force void* alignment */ - cbp = top_up_cbuf(&cbuf, cbp); - if (cbuf.end - cbp >= param_length) { - param_buf = (byte *)cbp; - cbp += param_length; - } else { - /* NOTE: param_buf must be maximally aligned */ - param_buf = gs_alloc_bytes(mem, param_length, - "clist put_params"); - if (param_buf == 0) { - code = gs_note_error(gs_error_VMerror); - goto out; - } - alloc_data_on_heap = true; - cleft = cbuf.end - cbp; - rleft = param_length - cleft; - memmove(param_buf, cbp, cleft); - sgets(s, param_buf + cleft, rleft, &rleft); - cbp = cbuf.end; /* force refill */ - } - - /* - * Create a gs_c_param_list & expand into it. - * NB that gs_c_param_list doesn't copy objects into - * it, but rather keeps *pointers* to what's passed. - * That's OK because the serialized format keeps enough - * space to hold expanded versions of the structures, - * but this means we cannot deallocate source buffer - * until the gs_c_param_list is deleted. - */ - gs_c_param_list_write(¶m_list, mem); - code = gs_param_list_unserialize - ( (gs_param_list *)¶m_list, param_buf ); - if (code >= 0 && code != param_length) - code = gs_error_unknownerror; /* must match */ - if (code >= 0) { - gs_c_param_list_read(¶m_list); - code = (*dev_proc(cdev, put_params)) - ((gx_device *)cdev, - (gs_param_list *)¶m_list); - } - gs_c_param_list_release(¶m_list); - if (alloc_data_on_heap) - gs_free_object(mem, param_buf, "clist put_params"); + case cmd_opv_put_params: + cbuf.ptr = cbp; + code = read_put_params(&cbuf, cdev, mem); + cbp = cbuf.ptr; + if (code > 0) + break; /* empty list */ if (code < 0) goto out; if (playback_action == playback_action_setup) goto out; - } break; default: goto bad_op; @@ -1862,15 +1461,551 @@ in: /* Initialize for a new page. */ return code; } -/* Unpack a short bitmap */ -private void -clist_unpack_short_bits(byte * dest, const byte * src, int width_bytes, - int height, uint raster) +/* ---------------- Individual commands ---------------- */ + +/* + * These single-use procedures implement a few large individual commands, + * primarily for readability but also to avoid overflowing compilers' + * optimization limits. They all take the command buffer as their first + * parameter (pcb), assume that the current buffer pointer is in pcb->ptr, + * and update it there. + */ + +private int +read_set_tile_size(command_buf_t *pcb, tile_slot *bits) +{ + const byte *cbp = pcb->ptr; + uint rep_width, rep_height; + byte bd = *cbp++; + + bits->cb_depth = (bd & 31) + 1; + cmd_getw(rep_width, cbp); + cmd_getw(rep_height, cbp); + if (bd & 0x20) { + cmd_getw(bits->x_reps, cbp); + bits->width = rep_width * bits->x_reps; + } else { + bits->x_reps = 1; + bits->width = rep_width; + } + if (bd & 0x40) { + cmd_getw(bits->y_reps, cbp); + bits->height = rep_height * bits->y_reps; + } else { + bits->y_reps = 1; + bits->height = rep_height; + } + if (bd & 0x80) + cmd_getw(bits->rep_shift, cbp); + else + bits->rep_shift = 0; + if_debug6('L', " depth=%d size=(%d,%d), rep_size=(%d,%d), rep_shift=%d\n", + bits->cb_depth, bits->width, + bits->height, rep_width, + rep_height, bits->rep_shift); + bits->shift = + (bits->rep_shift == 0 ? 0 : + (bits->rep_shift * (bits->height / rep_height)) % rep_width); + bits->cb_raster = bitmap_raster(bits->width * bits->cb_depth); + pcb->ptr = cbp; + return 0; +} + +private int +read_set_bits(command_buf_t *pcb, tile_slot *bits, int compress, + gx_clist_state *pcls, gx_strip_bitmap *tile, tile_slot **pslot, + gx_device_clist_reader *cdev, gs_memory_t *mem) +{ + const byte *cbp = pcb->ptr; + uint rep_width = bits->width / bits->x_reps; + uint rep_height = bits->height / bits->y_reps; + uint index; + ulong offset; + uint width_bits = rep_width * bits->cb_depth; + uint width_bytes; + uint raster; + uint bytes = + clist_bitmap_bytes(width_bits, rep_height, + compress | + (rep_width < bits->width ? + decompress_spread : 0) | + decompress_elsewhere, + &width_bytes, + (uint *)&raster); + byte *data; + tile_slot *slot; + + cmd_getw(index, cbp); + cmd_getw(offset, cbp); + if_debug2('L', " index=%d offset=%lu\n", pcls->tile_index, offset); + pcls->tile_index = index; + cdev->tile_table[pcls->tile_index].offset = offset; + slot = (tile_slot *)(cdev->chunk.data + offset); + *pslot = slot; + *slot = *bits; + tile->data = data = (byte *)(slot + 1); +#ifdef DEBUG + slot->index = pcls->tile_index; +#endif + if (compress) { + /* + * Decompress the image data. We'd like to share this code with the + * similar code in copy_*, but right now we don't see how. + */ + stream_cursor_read r; + stream_cursor_write w; + /* + * We don't know the data length a priori, so to be conservative, we + * read the uncompressed size. + */ + uint cleft = pcb->end - cbp; + + if (cleft < bytes) { + uint nread = cbuf_size - cleft; + + memmove(pcb->data, cbp, cleft); + pcb->end_status = sgets(pcb->s, pcb->data + cleft, nread, &nread); + set_cb_end(pcb, pcb->data + cleft + nread); + cbp = pcb->data; + } + r.ptr = cbp - 1; + r.limit = pcb->end - 1; + w.ptr = data - 1; + w.limit = w.ptr + bytes; + switch (compress) { + case cmd_compress_rle: + { + stream_RLD_state sstate; + + clist_rld_init(&sstate); + (*s_RLD_template.process) + ((stream_state *)&sstate, &r, &w, true); + } + break; + case cmd_compress_cfe: + { + stream_CFD_state sstate; + + clist_cfd_init(&sstate, + width_bytes << 3 /*width_bits */ , + rep_height, mem); + (*s_CFD_template.process) + ((stream_state *)&sstate, &r, &w, true); + (*s_CFD_template.release) + ((stream_state *)&sstate); + } + break; + default: + return_error(gs_error_unregistered); + } + cbp = r.ptr + 1; + } else if (rep_height > 1 && width_bytes != bits->cb_raster) { + cbp = cmd_read_short_bits(pcb, data, + width_bytes, rep_height, + bits->cb_raster, cbp); + } else { + cbp = cmd_read_data(pcb, data, bytes, cbp); + } + if (bits->width > rep_width) + bits_replicate_horizontally(data, + rep_width * bits->cb_depth, rep_height, + bits->cb_raster, + bits->width * bits->cb_depth, + bits->cb_raster); + if (bits->height > rep_height) + bits_replicate_vertically(data, + rep_height, bits->cb_raster, + bits->height); +#ifdef DEBUG + if (gs_debug_c('L')) + cmd_print_bits(data, bits->width, bits->height, bits->cb_raster); +#endif + pcb->ptr = cbp; + return 0; +} + +private int +read_set_ht_order(command_buf_t *pcb, gx_device_halftone *pdht, + gx_ht_order **pporder, gs_memory_t *mem) +{ + const byte *cbp = pcb->ptr; + gx_ht_order *porder; + uint *levels; + gx_ht_bit *bits; + int index; + gx_ht_order new_order; + + cmd_getw(index, cbp); + if (index == 0) + porder = &pdht->order; + else { + gx_ht_order_component *pcomp = &pdht->components[index - 1]; + + cmd_getw(pcomp->cname, cbp); + if_debug1('L', " cname=%lu", (ulong) pcomp->cname); + porder = &pcomp->corder; + } + *pporder = porder; + new_order = *porder; + cmd_getw(new_order.width, cbp); + cmd_getw(new_order.height, cbp); + cmd_getw(new_order.raster, cbp); + cmd_getw(new_order.shift, cbp); + cmd_getw(new_order.num_levels, cbp); + cmd_getw(new_order.num_bits, cbp); + pcb->ptr = cbp; + if_debug7('L', " index=%d size=(%d,%d) raster=%d shift=%d num_levels=%d num_bits=%d\n", + index, new_order.width, new_order.height, + new_order.raster, new_order.shift, + new_order.num_levels, new_order.num_bits); + levels = porder->levels; + bits = porder->bits; + /* + * Note that for resizing a byte array, the element size is 1 byte, + * not the element size given to alloc_byte_array! + */ + if (new_order.num_levels > porder->num_levels) { + if (levels == 0) + levels = (uint *) gs_alloc_byte_array(mem, new_order.num_levels, + sizeof(*levels), + "ht order(levels)"); + else + levels = gs_resize_object(mem, levels, + new_order.num_levels * sizeof(*levels), + "ht order(levels)"); + if (levels == 0) + return_error(gs_error_VMerror); + /* Update porder in case we bail out. */ + porder->levels = levels; + porder->num_levels = new_order.num_levels; + } + if (new_order.num_bits > porder->num_bits) { + if (bits == 0) + bits = (gx_ht_bit *) gs_alloc_byte_array(mem, new_order.num_bits, + sizeof(*bits), + "ht order(bits)"); + else + bits = gs_resize_object(mem, bits, + new_order.num_bits * sizeof(*bits), + "ht order(bits)"); + if (bits == 0) + return_error(gs_error_VMerror); + } + *porder = new_order; + porder->levels = levels; + porder->bits = bits; + porder->full_height = ht_order_full_height(porder); + return 0; +} + +private int +read_set_ht_data(command_buf_t *pcb, uint *pdata_index, gx_ht_order *porder, + gx_device_halftone *pdht, gs_halftone_type halftone_type, + gs_imager_state *pis, gx_device_clist_reader *cdev, + gs_memory_t *mem) +{ + const byte *cbp = pcb->ptr; + int n = *cbp++; + + if (*pdata_index < porder->num_levels) { /* Setting levels */ + byte *lptr = (byte *)(porder->levels + *pdata_index); + + cbp = cmd_read_data(pcb, lptr, n * sizeof(*porder->levels), cbp); +#ifdef DEBUG + if (gs_debug_c('L')) { + int i; + + dprintf1(" levels[%u]", *pdata_index); + for (i = 0; i < n; ++i) + dprintf1(" %u", + porder->levels[*pdata_index + i]); + dputc('\n'); + } +#endif + } else { /* Setting bits */ + byte *bptr = (byte *) + (porder->bits + (*pdata_index - porder->num_levels)); + + cbp = cmd_read_data(pcb, bptr, n * sizeof(*porder->bits), cbp); +#ifdef DEBUG + if (gs_debug_c('L')) { + int i; + + dprintf1(" bits[%u]", *pdata_index - porder->num_levels); + for (i = 0; i < n; ++i) { + const gx_ht_bit *pb = + &porder->bits[*pdata_index - porder->num_levels + i]; + + dprintf2(" (%u,0x%lx)", + pb->offset, + (ulong) pb->mask); + } + dputc('\n'); + } +#endif + } + *pdata_index += n; + /* If this is the end of the data, */ + /* install the (device) halftone. */ + if (porder == + (pdht->components != 0 ? + &pdht->components[0].corder : + &pdht->order) && + *pdata_index == porder->num_levels + porder->num_bits + ) { /* Make sure we have a halftone cache. */ + uint i; + + if (pis->ht_cache == 0) { + gx_ht_cache *pcache = + gx_ht_alloc_cache(mem, + porder->num_levels + 2, + gx_ht_cache_default_bits()); + + if (pcache == 0) + return_error(gs_error_VMerror); + pis->ht_cache = pcache; + } + for (i = 1; i < pdht->num_comp; ++i) { + gx_ht_order *pco = &pdht->components[i].corder; + + if (!pco->cache) { + gx_ht_cache *pcache = + gx_ht_alloc_cache(mem, 1, + pco->raster * (pco->num_bits / + pco->width)); + + if (pcache == 0) + return_error(gs_error_VMerror); + pco->cache = pcache; + gx_ht_init_cache(pco->cache, pco); + } + } + if (pdht->num_comp) { + pdht->components[0].corder.cache = pis->ht_cache; + pdht->order = pdht->components[0].corder; + } + gx_imager_dev_ht_install(pis, pdht, halftone_type, + (const gx_device *)cdev); + } + pcb->ptr = cbp; + return 0; +} + +private int +read_begin_image(command_buf_t *pcb, gs_image_t *pim, int *pnum_planes, + gs_int_rect *prect, const gs_color_space *pcs) +{ + const byte *cbp = pcb->ptr; + byte b = *cbp++; + int bpci = b >> 5; + static const byte bpc[6] = {1, 1, 2, 4, 8, 12}; + int num_components; + gs_image_format_t format; + + if (bpci == 0) + gs_image_t_init_mask(pim, false); + else + gs_image_t_init(pim, pcs); + if (b & (1 << 4)) { + byte b2 = *cbp++; + + format = b2 >> 6; + pim->Interpolate = (b2 & (1 << 5)) != 0; + pim->Alpha = (gs_image_alpha_t) ((b2 >> 3) & 3); + } else { + format = gs_image_format_chunky; + } + pim->format = format; + cmd_getw(pim->Width, cbp); + cmd_getw(pim->Height, cbp); + if_debug4('L', " BPCi=%d I=%d size=(%d,%d)", + bpci, (b & 0x10) != 0, pim->Width, pim->Height); + if (b & (1 << 3)) { /* Non-standard ImageMatrix */ + cbp = cmd_read_matrix( + &pim->ImageMatrix, cbp); + if_debug6('L', " matrix=[%g %g %g %g %g %g]", + pim->ImageMatrix.xx, pim->ImageMatrix.xy, + pim->ImageMatrix.yx, pim->ImageMatrix.yy, + pim->ImageMatrix.tx, pim->ImageMatrix.ty); + } else { + pim->ImageMatrix.xx = pim->Width; + pim->ImageMatrix.xy = 0; + pim->ImageMatrix.yx = 0; + pim->ImageMatrix.yy = -pim->Height; + pim->ImageMatrix.tx = 0; + pim->ImageMatrix.ty = pim->Height; + } + pim->BitsPerComponent = bpc[bpci]; + if (bpci == 0) { + num_components = 1; + } else { + pim->ColorSpace = pcs; + if (gs_color_space_get_index(pcs) == gs_color_space_index_Indexed) { + pim->Decode[0] = 0; + pim->Decode[1] = (1 << pim->BitsPerComponent) - 1; + } else { + static const float decode01[] = { + 0, 1, 0, 1, 0, 1, 0, 1, 0, 1 + }; + + memcpy(pim->Decode, decode01, sizeof(pim->Decode)); + } + num_components = gs_color_space_num_components(pcs); + } + switch (format) { + case gs_image_format_chunky: + *pnum_planes = 1; + break; + case gs_image_format_component_planar: + *pnum_planes = num_components; + break; + case gs_image_format_bit_planar: + *pnum_planes = num_components * pim->BitsPerComponent; + break; + default: + return_error(gs_error_unregistered); + } + if (b & (1 << 2)) { /* Non-standard Decode */ + byte dflags = *cbp++; + int i; + + for (i = 0; i < num_components * 2; dflags <<= 2, i += 2) + switch ((dflags >> 6) & 3) { + case 0: /* default */ + break; + case 1: /* swapped default */ + pim->Decode[i] = pim->Decode[i + 1]; + pim->Decode[i + 1] = 0; + break; + case 3: + cmd_get_value(pim->Decode[i], cbp); + /* falls through */ + case 2: + cmd_get_value(pim->Decode[i + 1], cbp); + } +#ifdef DEBUG + if (gs_debug_c('L')) { + dputs(" decode=["); + for (i = 0; i < num_components * 2; ++i) + dprintf1("%g ", pim->Decode[i]); + dputc(']'); + } +#endif + } + pim->adjust = false; + if (b & (1 << 1)) { + if (pim->ImageMask) + pim->adjust = true; + else + pim->CombineWithColor = true; + if_debug1('L', " %s", + (pim->ImageMask ? " adjust" : " CWC")); + } + if (b & (1 << 0)) { /* Non-standard rectangle */ + uint diff; + + cmd_getw(prect->p.x, cbp); + cmd_getw(prect->p.y, cbp); + cmd_getw(diff, cbp); + prect->q.x = pim->Width - diff; + cmd_getw(diff, cbp); + prect->q.y = pim->Height - diff; + if_debug4('L', " rect=(%d,%d),(%d,%d)", + prect->p.x, prect->p.y, + prect->q.x, prect->q.y); + } else { + prect->p.x = 0; + prect->p.y = 0; + prect->q.x = pim->Width; + prect->q.y = pim->Height; + } + if_debug0('L', "\n"); + pcb->ptr = cbp; + return 0; +} + +private int +read_put_params(command_buf_t *pcb, gx_device_clist_reader *cdev, + gs_memory_t *mem) +{ + const byte *cbp = pcb->ptr; + gs_c_param_list param_list; + uint cleft; + uint rleft; + bool alloc_data_on_heap = false; + byte *param_buf; + uint param_length; + int code = 0; + + cmd_get_value(param_length, cbp); + if_debug1('L', " length=%d\n", param_length); + if (param_length == 0) { + code = 1; /* empty list */ + goto out; + } + + /* Make sure entire serialized param list is in cbuf */ + /* + force void* alignment */ + cbp = top_up_cbuf(pcb, cbp); + if (pcb->end - cbp >= param_length) { + param_buf = (byte *)cbp; + cbp += param_length; + } else { + /* NOTE: param_buf must be maximally aligned */ + param_buf = gs_alloc_bytes(mem, param_length, + "clist put_params"); + if (param_buf == 0) { + code = gs_note_error(gs_error_VMerror); + goto out; + } + alloc_data_on_heap = true; + cleft = pcb->end - cbp; + rleft = param_length - cleft; + memmove(param_buf, cbp, cleft); + pcb->end_status = sgets(pcb->s, param_buf + cleft, rleft, &rleft); + cbp = pcb->end; /* force refill */ + } + + /* + * Create a gs_c_param_list & expand into it. + * NB that gs_c_param_list doesn't copy objects into + * it, but rather keeps *pointers* to what's passed. + * That's OK because the serialized format keeps enough + * space to hold expanded versions of the structures, + * but this means we cannot deallocate source buffer + * until the gs_c_param_list is deleted. + */ + gs_c_param_list_write(¶m_list, mem); + code = gs_param_list_unserialize + ( (gs_param_list *)¶m_list, param_buf ); + if (code >= 0 && code != param_length) + code = gs_error_unknownerror; /* must match */ + if (code >= 0) { + gs_c_param_list_read(¶m_list); + code = (*dev_proc(cdev, put_params)) + ((gx_device *)cdev, (gs_param_list *)¶m_list); + } + gs_c_param_list_release(¶m_list); + if (alloc_data_on_heap) + gs_free_object(mem, param_buf, "clist put_params"); + +out: + pcb->ptr = cbp; + return code; +} + +/* ---------------- Utilities ---------------- */ + +/* Read and unpack a short bitmap */ +private const byte * +cmd_read_short_bits(command_buf_t *pcb, byte *data, int width_bytes, + int height, uint raster, const byte *cbp) { uint bytes = width_bytes * height; - const byte *pdata = src + bytes; - byte *udata = dest + height * raster; + const byte *pdata = data /*src*/ + bytes; + byte *udata = data /*dest*/ + height * raster; + cbp = cmd_read_data(pcb, data, width_bytes * height, cbp); while (--height >= 0) { udata -= raster, pdata -= width_bytes; switch (width_bytes) { @@ -1892,6 +2027,7 @@ clist_unpack_short_bits(byte * dest, const byte * src, int width_bytes, case 0:; /* shouldn't happen */ } } + return cbp; } /* Read a rectangle. */ @@ -2028,52 +2164,6 @@ alloc: if (!load) { return 0; } -/* Install a halftone order, resizing the bits and levels if necessary. */ -private int -cmd_install_ht_order(gx_ht_order * porder, const gx_ht_order * pnew, - gs_memory_t * mem) -{ - uint *levels = porder->levels; - gx_ht_bit *bits = porder->bits; - - /* - * Note that for resizing a byte array, the element size is 1 byte, - * not the element size given to alloc_byte_array! - */ - if (pnew->num_levels > porder->num_levels) { - if (levels == 0) - levels = (uint *) gs_alloc_byte_array(mem, pnew->num_levels, - sizeof(*levels), - "ht order(levels)"); - else - levels = gs_resize_object(mem, levels, - pnew->num_levels * sizeof(*levels), - "ht order(levels)"); - if (levels == 0) - return_error(gs_error_VMerror); - /* Update porder in case we bail out. */ - porder->levels = levels; - porder->num_levels = pnew->num_levels; - } - if (pnew->num_bits > porder->num_bits) { - if (bits == 0) - bits = (gx_ht_bit *) gs_alloc_byte_array(mem, pnew->num_bits, - sizeof(*bits), - "ht order(bits)"); - else - bits = gs_resize_object(mem, bits, - pnew->num_bits * sizeof(*bits), - "ht order(bits)"); - if (bits == 0) - return_error(gs_error_VMerror); - } - *porder = *pnew; - porder->levels = levels; - porder->bits = bits; - porder->full_height = ht_order_full_height(porder); - return 0; -} - /* Resize the halftone components array if necessary. */ private int cmd_resize_halftone(gx_device_halftone * pdht, uint num_comp, diff --git a/gs/src/gxclread.c b/gs/src/gxclread.c index cd48dbb8d..dd9a23f82 100644 --- a/gs/src/gxclread.c +++ b/gs/src/gxclread.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Command list reading for Ghostscript. */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gxclrect.c b/gs/src/gxclrect.c index a17c39475..0debf11bd 100644 --- a/gs/src/gxclrect.c +++ b/gs/src/gxclrect.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Rectangle-oriented command writing for command list */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gxclutil.c b/gs/src/gxclutil.c index 9bc9fdc07..a89983842 100644 --- a/gs/src/gxclutil.c +++ b/gs/src/gxclutil.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Command list writing utilities. */ #include "memory_.h" diff --git a/gs/src/gxclzlib.c b/gs/src/gxclzlib.c index 202589068..3252f3af4 100644 --- a/gs/src/gxclzlib.c +++ b/gs/src/gxclzlib.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* zlib filter initialization for RAM-based band lists */ /* Must be compiled with -I$(ZSRCDIR) */ #include "std.h" diff --git a/gs/src/gxcmap.c b/gs/src/gxcmap.c index dd7f33b84..6fe318b09 100644 --- a/gs/src/gxcmap.c +++ b/gs/src/gxcmap.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Color mapping for Ghostscript */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gxcmap.h b/gs/src/gxcmap.h index 5a4361343..2ba95992b 100644 --- a/gs/src/gxcmap.h +++ b/gs/src/gxcmap.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gxdcolor.h, gxdevice.h. */ #ifndef gxcmap_INCLUDED diff --git a/gs/src/gxcolor2.h b/gs/src/gxcolor2.h index 6b232d01e..e26c28482 100644 --- a/gs/src/gxcolor2.h +++ b/gs/src/gxcolor2.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal definitions for Level 2 color routines */ /* Requires gsstruct.h, gxfixed.h */ diff --git a/gs/src/gxcomp.h b/gs/src/gxcomp.h index 545fe7ed3..9f142ef5e 100644 --- a/gs/src/gxcomp.h +++ b/gs/src/gxcomp.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for implementing compositing functions */ #ifndef gxcomp_INCLUDED diff --git a/gs/src/gxcoord.h b/gs/src/gxcoord.h index c9b2e3944..6e22820f6 100644 --- a/gs/src/gxcoord.h +++ b/gs/src/gxcoord.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gxmatrix.h and gzstate.h */ #ifndef gxcoord_INCLUDED diff --git a/gs/src/gxcpath.c b/gs/src/gxcpath.c index d2d379386..6de016e41 100644 --- a/gs/src/gxcpath.c +++ b/gs/src/gxcpath.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Implementation of clipping paths, other than actual clipping */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gxcpath.h b/gs/src/gxcpath.h index 2bccccdd9..92b48efd2 100644 --- a/gs/src/gxcpath.h +++ b/gs/src/gxcpath.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gxdevice.h */ #ifndef gxcpath_INCLUDED diff --git a/gs/src/gxcspace.h b/gs/src/gxcspace.h index 0a4be2788..ddf43403e 100644 --- a/gs/src/gxcspace.h +++ b/gs/src/gxcspace.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Implementation of color spaces */ /* Requires gsstruct.h */ diff --git a/gs/src/gxctable.c b/gs/src/gxctable.c index 9ff858823..e2bb964c0 100644 --- a/gs/src/gxctable.c +++ b/gs/src/gxctable.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Color table lookup and interpolation */ #include "gx.h" #include "gxfixed.h" diff --git a/gs/src/gxctable.h b/gs/src/gxctable.h index dc2f0239c..37c11d669 100644 --- a/gs/src/gxctable.h +++ b/gs/src/gxctable.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to color table lookup and interpolation */ #ifndef gxctable_INCLUDED diff --git a/gs/src/gxcvalue.h b/gs/src/gxcvalue.h index 313fb333f..b885c2b4d 100644 --- a/gs/src/gxcvalue.h +++ b/gs/src/gxcvalue.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definition of device color values */ #ifndef gxcvalue_INCLUDED diff --git a/gs/src/gxdcconv.c b/gs/src/gxdcconv.c index 3367f6193..e5cbb1c9c 100644 --- a/gs/src/gxdcconv.c +++ b/gs/src/gxdcconv.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Conversion between device color spaces for Ghostscript */ #include "gx.h" #include "gsdcolor.h" /* for gxcmap.h */ diff --git a/gs/src/gxdcconv.h b/gs/src/gxdcconv.h index fbe8159d7..9b4dbdadb 100644 --- a/gs/src/gxdcconv.h +++ b/gs/src/gxdcconv.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal device color conversion interfaces */ #ifndef gxdcconv_INCLUDED diff --git a/gs/src/gxdcolor.c b/gs/src/gxdcolor.c index 82bd0644a..6c84e2013 100644 --- a/gs/src/gxdcolor.c +++ b/gs/src/gxdcolor.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Pure and null device color implementation */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gxdcolor.h b/gs/src/gxdcolor.h index 04a172ae6..73321f712 100644 --- a/gs/src/gxdcolor.h +++ b/gs/src/gxdcolor.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Device color representation for Ghostscript */ #ifndef gxdcolor_INCLUDED diff --git a/gs/src/gxdda.h b/gs/src/gxdda.h index 622834ca9..52269acd2 100644 --- a/gs/src/gxdda.h +++ b/gs/src/gxdda.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gxfixed.h */ #ifndef gxdda_INCLUDED diff --git a/gs/src/gxdevcli.h b/gs/src/gxdevcli.h index e6a771020..dae355881 100644 --- a/gs/src/gxdevcli.h +++ b/gs/src/gxdevcli.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for device clients */ #ifndef gxdevcli_INCLUDED diff --git a/gs/src/gxdevice.h b/gs/src/gxdevice.h index 3f612f49f..749962166 100644 --- a/gs/src/gxdevice.h +++ b/gs/src/gxdevice.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for device implementors */ #ifndef gxdevice_INCLUDED diff --git a/gs/src/gxdevmem.h b/gs/src/gxdevmem.h index f30182a30..fa8deb345 100644 --- a/gs/src/gxdevmem.h +++ b/gs/src/gxdevmem.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gxdevice.h */ #ifndef gxdevmem_INCLUDED diff --git a/gs/src/gxdevrop.h b/gs/src/gxdevrop.h index ba1c1caf3..fe8b90f63 100644 --- a/gs/src/gxdevrop.h +++ b/gs/src/gxdevrop.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Extension of gxdevice.h for RasterOp */ #ifndef gxdevrop_INCLUDED diff --git a/gs/src/gxdht.h b/gs/src/gxdht.h index 942b47462..90fdd8121 100644 --- a/gs/src/gxdht.h +++ b/gs/src/gxdht.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definition of device halftones */ #ifndef gxdht_INCLUDED diff --git a/gs/src/gxdither.c b/gs/src/gxdither.c index d555c484e..137fa2c00 100644 --- a/gs/src/gxdither.c +++ b/gs/src/gxdither.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + #include "gx.h" #include "gsstruct.h" #include "gsdcolor.h" diff --git a/gs/src/gxdither.h b/gs/src/gxdither.h index 7905b2d2f..2049503cb 100644 --- a/gs/src/gxdither.h +++ b/gs/src/gxdither.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to gxdither.c */ #ifndef gxdither_INCLUDED diff --git a/gs/src/gxfarith.h b/gs/src/gxfarith.h index 6ab5ad482..86a6771f3 100644 --- a/gs/src/gxfarith.h +++ b/gs/src/gxfarith.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Floating point arithmetic macros for Ghostscript library */ #ifndef gxfarith_INCLUDED diff --git a/gs/src/gxfcache.h b/gs/src/gxfcache.h index 95834f1db..5b9f0409b 100644 --- a/gs/src/gxfcache.h +++ b/gs/src/gxfcache.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gsfont.h */ #ifndef gxfcache_INCLUDED diff --git a/gs/src/gxfcmap.h b/gs/src/gxfcmap.h index 0d36d23fe..747d7c2eb 100644 --- a/gs/src/gxfcmap.h +++ b/gs/src/gxfcmap.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal CMap data definition */ /* This file should be called gxcmap.h, except that name is already used. */ diff --git a/gs/src/gxfill.c b/gs/src/gxfill.c index 1f37cc556..7ef53b343 100644 --- a/gs/src/gxfill.c +++ b/gs/src/gxfill.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Lower-level path filling procedures */ #include "math_.h" /* for floor in fixed_mult_quo */ #include "gx.h" diff --git a/gs/src/gxfixed.h b/gs/src/gxfixed.h index 881b9da0a..fc34566c4 100644 --- a/gs/src/gxfixed.h +++ b/gs/src/gxfixed.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Fixed-point arithmetic for Ghostscript */ #ifndef gxfixed_INCLUDED diff --git a/gs/src/gxfmap.h b/gs/src/gxfmap.h index b0c4ce263..439c14370 100644 --- a/gs/src/gxfmap.h +++ b/gs/src/gxfmap.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Fraction map representation for Ghostscript */ #ifndef gxfmap_INCLUDED diff --git a/gs/src/gxfont.h b/gs/src/gxfont.h index 44e3f701f..78953029f 100644 --- a/gs/src/gxfont.h +++ b/gs/src/gxfont.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gsmatrix.h, gxdevice.h */ #ifndef gxfont_INCLUDED diff --git a/gs/src/gxfont0.h b/gs/src/gxfont0.h index a4ccb1808..d8e076655 100644 --- a/gs/src/gxfont0.h +++ b/gs/src/gxfont0.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Type 0 (composite) font data definition */ #ifndef gxfont0_INCLUDED diff --git a/gs/src/gxfont1.h b/gs/src/gxfont1.h index 25d84e336..14d68bcf8 100644 --- a/gs/src/gxfont1.h +++ b/gs/src/gxfont1.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Type 1 font data definition (including Type 2 charstrings) */ #ifndef gxfont1_INCLUDED diff --git a/gs/src/gxfont42.h b/gs/src/gxfont42.h index b06b610dc..f04c5db6a 100644 --- a/gs/src/gxfont42.h +++ b/gs/src/gxfont42.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Type 42 font data definition */ #ifndef gxfont42_INCLUDED diff --git a/gs/src/gxfrac.h b/gs/src/gxfrac.h index 92b2eb015..0ae7dcd70 100644 --- a/gs/src/gxfrac.h +++ b/gs/src/gxfrac.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Fraction representation for Ghostscript */ #ifndef gxfrac_INCLUDED diff --git a/gs/src/gxftype.h b/gs/src/gxftype.h index 52006046a..a3e7641ea 100644 --- a/gs/src/gxftype.h +++ b/gs/src/gxftype.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definition of font type and bitmap font behavior */ #ifndef gxftype_INCLUDED diff --git a/gs/src/gxfunc.h b/gs/src/gxfunc.h index c0b79321e..f9d64a727 100644 --- a/gs/src/gxfunc.h +++ b/gs/src/gxfunc.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal definitions for Functions */ #ifndef gxfunc_INCLUDED diff --git a/gs/src/gxgetbit.h b/gs/src/gxgetbit.h index 9a52ed4fe..ccd309af3 100644 --- a/gs/src/gxgetbit.h +++ b/gs/src/gxgetbit.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface for get_bits_rectangle driver procedure */ #ifndef gxgetbit_INCLUDED diff --git a/gs/src/gxhint1.c b/gs/src/gxhint1.c index 72e6ca003..26a462afa 100644 --- a/gs/src/gxhint1.c +++ b/gs/src/gxhint1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Font level hints for Type 1 fonts */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gxhint2.c b/gs/src/gxhint2.c index b74fffc1a..5665c9120 100644 --- a/gs/src/gxhint2.c +++ b/gs/src/gxhint2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Character level hints for Type 1 fonts. */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gxhint3.c b/gs/src/gxhint3.c index db29a2eca..1c4bf2632 100644 --- a/gs/src/gxhint3.c +++ b/gs/src/gxhint3.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Apply hints for Type 1 fonts. */ #include "math_.h" /* for floor in fixed_mult_quo */ #include "gx.h" diff --git a/gs/src/gxht.c b/gs/src/gxht.c index 79d1cac1d..919711a78 100644 --- a/gs/src/gxht.c +++ b/gs/src/gxht.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Halftone rendering routines for Ghostscript imaging library */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gxht.h b/gs/src/gxht.h index fd0095d5e..3f09090e2 100644 --- a/gs/src/gxht.h +++ b/gs/src/gxht.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Rest of (client) halftone definitions */ #ifndef gxht_INCLUDED @@ -205,8 +205,6 @@ int gs_screen_init_memory(P5(gs_screen_enum *, gs_state *, /* Procedural interface for MinScreenLevels (a Ghostscript extension) */ -/* Set/get the MinScreenLevels value. */ - /* * Set/get the MinScreenLevels value. * diff --git a/gs/src/gxhttile.h b/gs/src/gxhttile.h index 5254979c4..eb9cc627c 100644 --- a/gs/src/gxhttile.h +++ b/gs/src/gxhttile.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Halftone tile definition */ /* Requires gxbitmap.h */ diff --git a/gs/src/gxhttype.h b/gs/src/gxhttype.h index caf878506..241b5d645 100644 --- a/gs/src/gxhttype.h +++ b/gs/src/gxhttype.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Client halftone type enumeration */ #ifndef gxhttype_INCLUDED diff --git a/gs/src/gxi12bit.c b/gs/src/gxi12bit.c index a2d0c73e7..0fbc68f52 100644 --- a/gs/src/gxi12bit.c +++ b/gs/src/gxi12bit.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* 12-bit image procedures */ #include "gx.h" #include "memory_.h" diff --git a/gs/src/gxicolor.c b/gs/src/gxicolor.c index 80eb5a153..11bb01c9a 100644 --- a/gs/src/gxicolor.c +++ b/gs/src/gxicolor.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Color image rendering */ #include "gx.h" #include "memory_.h" diff --git a/gs/src/gxidata.c b/gs/src/gxidata.c index 010fc44c5..75cdf6daf 100644 --- a/gs/src/gxidata.c +++ b/gs/src/gxidata.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic image enumeration and cleanup */ #include "gx.h" #include "memory_.h" diff --git a/gs/src/gxifast.c b/gs/src/gxifast.c index 502043d8f..c6473fb5c 100644 --- a/gs/src/gxifast.c +++ b/gs/src/gxifast.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Fast monochrome image rendering */ #include "gx.h" #include "memory_.h" diff --git a/gs/src/gxiinit.c b/gs/src/gxiinit.c index 0e73d2c4c..d47f5442e 100644 --- a/gs/src/gxiinit.c +++ b/gs/src/gxiinit.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Image setup procedures for Ghostscript library */ #include "gx.h" #include "math_.h" diff --git a/gs/src/gximage.h b/gs/src/gximage.h index 0ac289d52..9ad30fbce 100644 --- a/gs/src/gximage.h +++ b/gs/src/gximage.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gxcpath.h, gxdevmem.h, gxdcolor.h, gzpath.h */ #ifndef gximage_INCLUDED diff --git a/gs/src/gximage2.c b/gs/src/gximage2.c index d3bb6cb84..e7288f72c 100644 --- a/gs/src/gximage2.c +++ b/gs/src/gximage2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* ImageType 2 image implementation */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/gximage3.c b/gs/src/gximage3.c index a948962ef..527ea5437 100644 --- a/gs/src/gximage3.c +++ b/gs/src/gximage3.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* ImageType 3 image implementation */ #include "math_.h" /* for ceil, floor */ #include "memory_.h" diff --git a/gs/src/gximage4.c b/gs/src/gximage4.c index 71153d146..dfd7735e8 100644 --- a/gs/src/gximage4.c +++ b/gs/src/gximage4.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* ImageType 4 image implementation */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gximono.c b/gs/src/gximono.c index 34d73a9f0..72438db6c 100644 --- a/gs/src/gximono.c +++ b/gs/src/gximono.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* General mono-component image rendering */ #include "gx.h" #include "memory_.h" diff --git a/gs/src/gxiodev.h b/gs/src/gxiodev.h index 27218f6c8..bd5799c19 100644 --- a/gs/src/gxiodev.h +++ b/gs/src/gxiodev.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gsmemory.h */ #ifndef gxiodev_INCLUDED diff --git a/gs/src/gxiparam.h b/gs/src/gxiparam.h index 16a041421..1cab0dc62 100644 --- a/gs/src/gxiparam.h +++ b/gs/src/gxiparam.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for implementors of image types */ #ifndef gxiparam_INCLUDED diff --git a/gs/src/gxiscale.c b/gs/src/gxiscale.c index 4fb2718f5..826bf73ec 100644 --- a/gs/src/gxiscale.c +++ b/gs/src/gxiscale.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interpolated image procedures */ #include "gx.h" #include "math_.h" diff --git a/gs/src/gxistate.h b/gs/src/gxistate.h index 98bf6e229..2c8c3d4d9 100644 --- a/gs/src/gxistate.h +++ b/gs/src/gxistate.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Imager state definition */ #ifndef gxistate_INCLUDED diff --git a/gs/src/gxline.h b/gs/src/gxline.h index df176c59d..20bdef2bb 100644 --- a/gs/src/gxline.h +++ b/gs/src/gxline.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Private line parameter definitions */ #ifndef gxline_INCLUDED diff --git a/gs/src/gxlum.h b/gs/src/gxlum.h index 9ca7b63ef..91c11d48e 100644 --- a/gs/src/gxlum.h +++ b/gs/src/gxlum.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Luminance computation parameters for Ghostscript */ #ifndef gxlum_INCLUDED diff --git a/gs/src/gxmatrix.h b/gs/src/gxmatrix.h index 07e227eda..2df3c9931 100644 --- a/gs/src/gxmatrix.h +++ b/gs/src/gxmatrix.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal matrix routines for Ghostscript library */ #ifndef gxmatrix_INCLUDED diff --git a/gs/src/gxmclip.c b/gs/src/gxmclip.c index 08f73bd50..9536ce818 100644 --- a/gs/src/gxmclip.c +++ b/gs/src/gxmclip.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Mask clipping support */ #include "gx.h" #include "gxdevice.h" diff --git a/gs/src/gxmclip.h b/gs/src/gxmclip.h index 249a57e68..571744cdc 100644 --- a/gs/src/gxmclip.h +++ b/gs/src/gxmclip.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Mask clipping device and interface */ /* Requires gxdevice.h, gxdevmem.h */ diff --git a/gs/src/gxobj.h b/gs/src/gxobj.h index ab966a1eb..b6daf0aa2 100644 --- a/gs/src/gxobj.h +++ b/gs/src/gxobj.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Memory manager implementation structures for Ghostscript */ #ifndef gxobj_INCLUDED diff --git a/gs/src/gxop1.h b/gs/src/gxop1.h index f248f8eda..1ec2fa267 100644 --- a/gs/src/gxop1.h +++ b/gs/src/gxop1.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Type 1 state shared between interpreter and compiled fonts. */ #ifndef gxop1_INCLUDED diff --git a/gs/src/gxp1fill.c b/gs/src/gxp1fill.c index bd8761d83..a52dfb80a 100644 --- a/gs/src/gxp1fill.c +++ b/gs/src/gxp1fill.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* PatternType 1 filling algorithms */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gxp1fill.h b/gs/src/gxp1fill.h index d9bb103e4..e41a2bf65 100644 --- a/gs/src/gxp1fill.h +++ b/gs/src/gxp1fill.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* PatternType 1 filling algorithm interface */ #ifndef gxp1fill_INCLUDED diff --git a/gs/src/gxpageq.c b/gs/src/gxpageq.c index 6b3e3e82d..d61cefdc8 100644 --- a/gs/src/gxpageq.c +++ b/gs/src/gxpageq.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Page queue implementation */ /* Initial version 2/1/98 by John Desrosiers (soho@crl.com) */ diff --git a/gs/src/gxpageq.h b/gs/src/gxpageq.h index 5b5eb47e2..d8aa9def3 100644 --- a/gs/src/gxpageq.h +++ b/gs/src/gxpageq.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Page queue implementation */ /* Initial version 2/1/98 by John Desrosiers (soho@crl.com) */ diff --git a/gs/src/gxpaint.c b/gs/src/gxpaint.c index 0a91bb62c..4bf7f9e16 100644 --- a/gs/src/gxpaint.c +++ b/gs/src/gxpaint.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Graphics-state-aware fill and stroke procedures */ #include "gx.h" #include "gzstate.h" diff --git a/gs/src/gxpaint.h b/gs/src/gxpaint.h index 4838422ed..cb8751f19 100644 --- a/gs/src/gxpaint.h +++ b/gs/src/gxpaint.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gsropt.h, gxfixed.h, gxpath.h */ #ifndef gxpaint_INCLUDED diff --git a/gs/src/gxpath.c b/gs/src/gxpath.c index e219d8ff7..4f95d737b 100644 --- a/gs/src/gxpath.c +++ b/gs/src/gxpath.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal path management routines for Ghostscript library */ #include "gx.h" #include "gserrors.h" diff --git a/gs/src/gxpath.h b/gs/src/gxpath.h index 8c89f551f..ee6cee2d8 100644 --- a/gs/src/gxpath.h +++ b/gs/src/gxpath.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gxfixed.h */ #ifndef gxpath_INCLUDED diff --git a/gs/src/gxpath2.c b/gs/src/gxpath2.c index e22d7d197..cc0675012 100644 --- a/gs/src/gxpath2.c +++ b/gs/src/gxpath2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Path tracing procedures for Ghostscript library */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gxpcache.h b/gs/src/gxpcache.h index b3dc2ac38..a144c66c1 100644 --- a/gs/src/gxpcache.h +++ b/gs/src/gxpcache.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definition of Pattern cache */ #ifndef gxpcache_INCLUDED diff --git a/gs/src/gxpcmap.c b/gs/src/gxpcmap.c index 71e07c753..d27f0ba0f 100644 --- a/gs/src/gxpcmap.c +++ b/gs/src/gxpcmap.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Pattern color mapping for Ghostscript library */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/gxpcolor.h b/gs/src/gxpcolor.h index 0224e4670..ccbb8e391 100644 --- a/gs/src/gxpcolor.h +++ b/gs/src/gxpcolor.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gsmatrix.h, gxdevice.h, gxdevmem.h, gxcolor2.h, gxdcolor.h */ #ifndef gxpcolor_INCLUDED diff --git a/gs/src/gxpcopy.c b/gs/src/gxpcopy.c index 1ecf11e3f..a4dd3e844 100644 --- a/gs/src/gxpcopy.c +++ b/gs/src/gxpcopy.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Path copying and flattening */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gxpdash.c b/gs/src/gxpdash.c index f1921c68e..019b5dd26 100644 --- a/gs/src/gxpdash.c +++ b/gs/src/gxpdash.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Dash expansion for paths */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gxpflat.c b/gs/src/gxpflat.c index ce42e8b91..83ff1a72e 100644 --- a/gs/src/gxpflat.c +++ b/gs/src/gxpflat.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Path flattening algorithms */ #include "gx.h" #include "gxarith.h" diff --git a/gs/src/gxropc.h b/gs/src/gxropc.h index c8344b904..23d72e9bf 100644 --- a/gs/src/gxropc.h +++ b/gs/src/gxropc.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internals for RasterOp compositing */ #ifndef gxropc_INCLUDED diff --git a/gs/src/gxsample.c b/gs/src/gxsample.c index af3216f9d..b6d91dc89 100644 --- a/gs/src/gxsample.c +++ b/gs/src/gxsample.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Sample unpacking procedures */ #include "gx.h" #include "gxsample.h" diff --git a/gs/src/gxsample.h b/gs/src/gxsample.h index 6bd637bf6..94f14114d 100644 --- a/gs/src/gxsample.h +++ b/gs/src/gxsample.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Sample lookup and expansion */ #ifndef gxsample_INCLUDED diff --git a/gs/src/gxshade.c b/gs/src/gxshade.c index f42c3d313..17d56d483 100644 --- a/gs/src/gxshade.c +++ b/gs/src/gxshade.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Shading rendering support */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gxshade.h b/gs/src/gxshade.h index 7c61a7b64..54c30f891 100644 --- a/gs/src/gxshade.h +++ b/gs/src/gxshade.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal definitions for shading rendering */ #ifndef gxshade_INCLUDED diff --git a/gs/src/gxshade1.c b/gs/src/gxshade1.c index 0adee4311..d69731241 100644 --- a/gs/src/gxshade1.c +++ b/gs/src/gxshade1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Rendering for non-mesh shadings */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gxshade4.c b/gs/src/gxshade4.c index e7a82d766..d9ad94bdc 100644 --- a/gs/src/gxshade4.c +++ b/gs/src/gxshade4.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Rendering for Gouraud triangle shadings */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gxshade4.h b/gs/src/gxshade4.h index 45ef26de8..8c2505f11 100644 --- a/gs/src/gxshade4.h +++ b/gs/src/gxshade4.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal definitions for triangle shading rendering */ #ifndef gxshade4_INCLUDED diff --git a/gs/src/gxshade6.c b/gs/src/gxshade6.c index b49d9e281..ea37fb2b7 100644 --- a/gs/src/gxshade6.c +++ b/gs/src/gxshade6.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Rendering for Coons and tensor patch shadings */ #include "memory_.h" #include "gx.h" diff --git a/gs/src/gxstate.h b/gs/src/gxstate.h index 053876927..3ab25cb56 100644 --- a/gs/src/gxstate.h +++ b/gs/src/gxstate.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal graphics state API */ #ifndef gxstate_INCLUDED diff --git a/gs/src/gxstroke.c b/gs/src/gxstroke.c index f08aa4ec4..d1218e2d4 100644 --- a/gs/src/gxstroke.c +++ b/gs/src/gxstroke.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Path stroking procedures for Ghostscript library */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gxsync.c b/gs/src/gxsync.c index f113e095b..9da9a84d1 100644 --- a/gs/src/gxsync.c +++ b/gs/src/gxsync.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to platform-based synchronization primitives */ /* Initial version 2/1/98 by John Desrosiers (soho@crl.com) */ diff --git a/gs/src/gxsync.h b/gs/src/gxsync.h index 273277d96..8a471e38d 100644 --- a/gs/src/gxsync.h +++ b/gs/src/gxsync.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to synchronization primitives */ /* Initial version 2/1/98 by John Desrosiers (soho@crl.com) */ diff --git a/gs/src/gxtext.h b/gs/src/gxtext.h index f6fb70b5d..1e6a0a317 100644 --- a/gs/src/gxtext.h +++ b/gs/src/gxtext.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Driver text interface implementation support */ #ifndef gxtext_INCLUDED diff --git a/gs/src/gxtmap.h b/gs/src/gxtmap.h index be961d749..53a556a16 100644 --- a/gs/src/gxtmap.h +++ b/gs/src/gxtmap.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definition of transfer mapping function */ /* (also used for black generation and undercolor removal) */ diff --git a/gs/src/gxtype1.c b/gs/src/gxtype1.c index 0ba6c6169..0097b6cbd 100644 --- a/gs/src/gxtype1.c +++ b/gs/src/gxtype1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Adobe Type 1 font interpreter support */ #include "math_.h" #include "gx.h" diff --git a/gs/src/gxtype1.h b/gs/src/gxtype1.h index 37b371204..afeee0205 100644 --- a/gs/src/gxtype1.h +++ b/gs/src/gxtype1.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Private Adobe Type 1 / Type 2 charstring interpreter definitions */ #ifndef gxtype1_INCLUDED diff --git a/gs/src/gxxfont.h b/gs/src/gxxfont.h index 598ea8e0a..b2fc100d9 100644 --- a/gs/src/gxxfont.h +++ b/gs/src/gxxfont.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* External font interface for Ghostscript library */ #ifndef gxxfont_INCLUDED diff --git a/gs/src/gzacpath.h b/gs/src/gzacpath.h index 47f4d2359..40cbc4841 100644 --- a/gs/src/gzacpath.h +++ b/gs/src/gzacpath.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gxdevice.h, gzcpath.h */ #ifndef gzacpath_INCLUDED diff --git a/gs/src/gzcpath.h b/gs/src/gzcpath.h index d989c1e78..94f057b43 100644 --- a/gs/src/gzcpath.h +++ b/gs/src/gzcpath.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gzpath.h. */ #ifndef gzcpath_INCLUDED diff --git a/gs/src/gzline.h b/gs/src/gzline.h index 55684476a..ab95cf071 100644 --- a/gs/src/gzline.h +++ b/gs/src/gzline.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Line parameter implementation */ #ifndef gzline_INCLUDED diff --git a/gs/src/gzpath.h b/gs/src/gzpath.h index ab3f0c2da..f210fe2a2 100644 --- a/gs/src/gzpath.h +++ b/gs/src/gzpath.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gxfixed.h */ #ifndef gzpath_INCLUDED diff --git a/gs/src/gzstate.h b/gs/src/gzstate.h index 1a4778479..423f3ff6c 100644 --- a/gs/src/gzstate.h +++ b/gs/src/gzstate.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Private graphics state definition for Ghostscript library */ #ifndef gzstate_INCLUDED diff --git a/gs/src/ialloc.c b/gs/src/ialloc.c index 57ec431ed..e62d7d771 100644 --- a/gs/src/ialloc.c +++ b/gs/src/ialloc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Memory allocator for Ghostscript interpreter */ #include "gx.h" #include "memory_.h" diff --git a/gs/src/ialloc.h b/gs/src/ialloc.h index dd10bc7b2..02b743b5c 100644 --- a/gs/src/ialloc.h +++ b/gs/src/ialloc.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to Ghostscript interpreter memory allocator */ #ifndef ialloc_INCLUDED diff --git a/gs/src/iastate.h b/gs/src/iastate.h index 6fe491201..bc3ccc075 100644 --- a/gs/src/iastate.h +++ b/gs/src/iastate.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gsmemory.h, gsstruct.h */ #ifndef iastate_INCLUDED diff --git a/gs/src/iastruct.h b/gs/src/iastruct.h index aa57e3a85..6f587f74d 100644 --- a/gs/src/iastruct.h +++ b/gs/src/iastruct.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interpreter memory manager implementation structures */ #ifndef iastruct_INCLUDED diff --git a/gs/src/ibnum.c b/gs/src/ibnum.c index 727631176..3762d5d73 100644 --- a/gs/src/ibnum.c +++ b/gs/src/ibnum.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Level 2 encoded number reading utilities for Ghostscript */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/ibnum.h b/gs/src/ibnum.h index 56ee4957c..b56397e6a 100644 --- a/gs/src/ibnum.h +++ b/gs/src/ibnum.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires stream.h */ #ifndef ibnum_INCLUDED diff --git a/gs/src/iccfont.c b/gs/src/iccfont.c index cefd51f16..1c4302a33 100644 --- a/gs/src/iccfont.c +++ b/gs/src/iccfont.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Initialization support for compiled fonts */ #include "string_.h" #include "ghost.h" diff --git a/gs/src/iccinit0.c b/gs/src/iccinit0.c index 8d913877b..79b85a7cb 100644 --- a/gs/src/iccinit0.c +++ b/gs/src/iccinit0.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Initialization string for non-compiled initialization */ #include "stdpre.h" diff --git a/gs/src/icfontab.c b/gs/src/icfontab.c index ae7a29e4f..bcfc711a1 100644 --- a/gs/src/icfontab.c +++ b/gs/src/icfontab.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Table of compiled fonts */ #include "ccfont.h" diff --git a/gs/src/ichar.h b/gs/src/ichar.h index 80f785e0f..22c95f3a7 100644 --- a/gs/src/ichar.h +++ b/gs/src/ichar.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gxchar.h */ #ifndef ichar_INCLUDED diff --git a/gs/src/icharout.h b/gs/src/icharout.h index 716f2ac11..b9ad6cd7a 100644 --- a/gs/src/icharout.h +++ b/gs/src/icharout.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to zcharout.c */ #ifndef icharout_INCLUDED diff --git a/gs/src/icie.h b/gs/src/icie.h index 70197b5f4..73b0ff6ab 100644 --- a/gs/src/icie.h +++ b/gs/src/icie.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal definitions for interpreter CIE color handling */ #ifndef icie_INCLUDED diff --git a/gs/src/icolor.h b/gs/src/icolor.h index d6861a6b9..351ef3048 100644 --- a/gs/src/icolor.h +++ b/gs/src/icolor.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Declarations for transfer function & similar cache remapping */ #ifndef icolor_INCLUDED diff --git a/gs/src/iconf.c b/gs/src/iconf.c index 137ecaaa2..fdc6a7648 100644 --- a/gs/src/iconf.c +++ b/gs/src/iconf.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Configuration-dependent tables and initialization for interpreter */ #include "stdio_.h" /* stdio for stream.h */ #include "gstypes.h" diff --git a/gs/src/icontext.c b/gs/src/icontext.c index 78bf078c0..c3f4eaf5a 100644 --- a/gs/src/icontext.c +++ b/gs/src/icontext.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Context state operations */ #include "ghost.h" #include "gsstruct.h" /* for gxalloc.h */ diff --git a/gs/src/icontext.h b/gs/src/icontext.h index ba1c43922..604e8e293 100644 --- a/gs/src/icontext.h +++ b/gs/src/icontext.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Externally visible context state */ /* Requires iref.h, stdio_.h */ diff --git a/gs/src/icsmap.h b/gs/src/icsmap.h index eb00df561..1042f8e0e 100644 --- a/gs/src/icsmap.h +++ b/gs/src/icsmap.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to shared routines for loading the cached color space maps. */ #ifndef icsmap_INCLUDED diff --git a/gs/src/icstate.h b/gs/src/icstate.h index 6719c46e6..7072404aa 100644 --- a/gs/src/icstate.h +++ b/gs/src/icstate.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Externally visible context state */ /* Requires iref.h */ diff --git a/gs/src/idebug.c b/gs/src/idebug.c index f09973722..8ebbb6f8a 100644 --- a/gs/src/idebug.c +++ b/gs/src/idebug.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Debugging support for Ghostscript interpreter */ /* This file must always be compiled with DEBUG set. */ #undef DEBUG diff --git a/gs/src/idebug.h b/gs/src/idebug.h index dc42bd2c9..ea445a6c6 100644 --- a/gs/src/idebug.h +++ b/gs/src/idebug.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Prototypes for debugging procedures in idebug.c */ #ifndef idebug_INCLUDED diff --git a/gs/src/idict.c b/gs/src/idict.c index 603665d1d..20cbb6d5b 100644 --- a/gs/src/idict.c +++ b/gs/src/idict.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Dictionary implementation */ #include "string_.h" /* for strlen */ #include "ghost.h" diff --git a/gs/src/idict.h b/gs/src/idict.h index 86302ce39..6777b28ec 100644 --- a/gs/src/idict.h +++ b/gs/src/idict.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interfaces for Ghostscript dictionary package */ #ifndef idict_INCLUDED diff --git a/gs/src/idictdef.h b/gs/src/idictdef.h index 759ba074e..155be829b 100644 --- a/gs/src/idictdef.h +++ b/gs/src/idictdef.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internals of dictionary implementation */ #ifndef idictdef_INCLUDED diff --git a/gs/src/idparam.c b/gs/src/idparam.c index de78f15bc..04f65710b 100644 --- a/gs/src/idparam.c +++ b/gs/src/idparam.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Utilities for getting parameters out of dictionaries. */ #include "memory_.h" #include "string_.h" /* for strlen */ diff --git a/gs/src/idparam.h b/gs/src/idparam.h index 4a6751c2e..2f2d5a50e 100644 --- a/gs/src/idparam.h +++ b/gs/src/idparam.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to idparam.c */ #ifndef idparam_INCLUDED diff --git a/gs/src/idstack.c b/gs/src/idstack.c index 16d025871..a073fe530 100644 --- a/gs/src/idstack.c +++ b/gs/src/idstack.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Implementation of dictionary stacks */ #include "ghost.h" #include "idict.h" diff --git a/gs/src/idstack.h b/gs/src/idstack.h index 1f1353c67..4bc55b533 100644 --- a/gs/src/idstack.h +++ b/gs/src/idstack.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic dictionary stack API */ #ifndef idstack_INCLUDED diff --git a/gs/src/iestack.h b/gs/src/iestack.h index 9e21ff29e..8553918b7 100644 --- a/gs/src/iestack.h +++ b/gs/src/iestack.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic execution stack API */ #ifndef iestack_INCLUDED diff --git a/gs/src/ifilter.h b/gs/src/ifilter.h index a13523b09..53fabdce3 100644 --- a/gs/src/ifilter.h +++ b/gs/src/ifilter.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires oper.h, stream.h, strimpl.h */ #ifndef ifilter_INCLUDED diff --git a/gs/src/ifont.h b/gs/src/ifont.h index 95fde0732..d587379b2 100644 --- a/gs/src/ifont.h +++ b/gs/src/ifont.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interpreter internal font representation */ #ifndef ifont_INCLUDED diff --git a/gs/src/ifunc.h b/gs/src/ifunc.h index b014b3057..79a992b76 100644 --- a/gs/src/ifunc.h +++ b/gs/src/ifunc.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal interpreter interfaces for Functions */ #ifndef ifunc_INCLUDED diff --git a/gs/src/igc.c b/gs/src/igc.c index afbd467f3..1ea38a8b7 100644 --- a/gs/src/igc.c +++ b/gs/src/igc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Garbage collector for Ghostscript */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/igc.h b/gs/src/igc.h index c93f5dfc5..55cccdf01 100644 --- a/gs/src/igc.h +++ b/gs/src/igc.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal interfaces in Ghostscript GC */ #ifndef igc_INCLUDED diff --git a/gs/src/igcref.c b/gs/src/igcref.c index b2717dbfa..03b150da5 100644 --- a/gs/src/igcref.c +++ b/gs/src/igcref.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* ref garbage collector for Ghostscript */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/igcstr.c b/gs/src/igcstr.c index fff54870d..66f04b4d6 100644 --- a/gs/src/igcstr.c +++ b/gs/src/igcstr.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* String GC routines for Ghostscript */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/igcstr.h b/gs/src/igcstr.h index 62247e0d1..0cf403a40 100644 --- a/gs/src/igcstr.h +++ b/gs/src/igcstr.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal interface to string garbage collector */ #ifndef igcstr_INCLUDED diff --git a/gs/src/igstate.h b/gs/src/igstate.h index da83b776a..7dfcd2e28 100644 --- a/gs/src/igstate.h +++ b/gs/src/igstate.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Ghostscript interpreter graphics state definition */ #ifndef igstate_INCLUDED diff --git a/gs/src/iht.h b/gs/src/iht.h index 844b9d69e..6e7937ce5 100644 --- a/gs/src/iht.h +++ b/gs/src/iht.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Procedures exported by zht.c for zht1.c and zht2.c */ #ifndef iht_INCLUDED diff --git a/gs/src/iimage.h b/gs/src/iimage.h index 1418de181..f444230ac 100644 --- a/gs/src/iimage.h +++ b/gs/src/iimage.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gscspace.h, gxiparam.h */ #ifndef iimage_INCLUDED diff --git a/gs/src/iimage2.h b/gs/src/iimage2.h index 2f4d12a0b..56094c15b 100644 --- a/gs/src/iimage2.h +++ b/gs/src/iimage2.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gsiparam.h */ #ifndef iimage2_INCLUDED diff --git a/gs/src/iinit.c b/gs/src/iinit.c index 36b0188ea..dc0c13641 100644 --- a/gs/src/iinit.c +++ b/gs/src/iinit.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Initialize internally known objects for Ghostscript interpreter */ #include "string_.h" #include "ghost.h" diff --git a/gs/src/ilevel.h b/gs/src/ilevel.h index 35858f478..521295b59 100644 --- a/gs/src/ilevel.h +++ b/gs/src/ilevel.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interpreter language level interface */ #ifndef ilevel_INCLUDED diff --git a/gs/src/ilocate.c b/gs/src/ilocate.c index 9bfbf8261..844ae6d4f 100644 --- a/gs/src/ilocate.c +++ b/gs/src/ilocate.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Object locating and validating for Ghostscript memory manager */ #include "ghost.h" #include "memory_.h" diff --git a/gs/src/imain.c b/gs/src/imain.c index 4d2140671..5ca807087 100644 --- a/gs/src/imain.c +++ b/gs/src/imain.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Common support for interpreter front ends */ #include "memory_.h" #include "string_.h" diff --git a/gs/src/imain.h b/gs/src/imain.h index 95c4c7a98..6d148e471 100644 --- a/gs/src/imain.h +++ b/gs/src/imain.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to imain.c */ /* Requires <stdio.h>, stdpre.h, gsmemory.h, gstypes.h, iref.h */ diff --git a/gs/src/imainarg.c b/gs/src/imainarg.c index c6c4ca4da..0e1b453d5 100644 --- a/gs/src/imainarg.c +++ b/gs/src/imainarg.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Command line parsing and dispatching */ #include "ctype_.h" #include "memory_.h" diff --git a/gs/src/imainarg.h b/gs/src/imainarg.h index 399bdad66..a3816f40b 100644 --- a/gs/src/imainarg.h +++ b/gs/src/imainarg.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* argv/argc interface to imainarg.c */ #ifndef imainarg_INCLUDED diff --git a/gs/src/imemory.h b/gs/src/imemory.h index 52e65e09d..d6d9180bf 100644 --- a/gs/src/imemory.h +++ b/gs/src/imemory.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Ghostscript memory allocator extensions for interpreter level */ #ifndef imemory_INCLUDED diff --git a/gs/src/iminst.h b/gs/src/iminst.h index 6d4444c50..6d426cab4 100644 --- a/gs/src/iminst.h +++ b/gs/src/iminst.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definition of interpreter instance */ /* Requires stdio_.h, gsmemory.h, iref.h */ diff --git a/gs/src/iname.c b/gs/src/iname.c index f052f9297..f15fe91e6 100644 --- a/gs/src/iname.c +++ b/gs/src/iname.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Name lookup for Ghostscript interpreter */ #include "memory_.h" #include "string_.h" diff --git a/gs/src/iname.h b/gs/src/iname.h index 2b4751ad9..c961a73b8 100644 --- a/gs/src/iname.h +++ b/gs/src/iname.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interpreter's name table interface */ #ifndef iname_INCLUDED diff --git a/gs/src/inamedef.h b/gs/src/inamedef.h index 5ace9c4bf..fa169f127 100644 --- a/gs/src/inamedef.h +++ b/gs/src/inamedef.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Name table definition */ #ifndef inamedef_INCLUDED diff --git a/gs/src/inames.h b/gs/src/inames.h index e38ad71a2..345a3408b 100644 --- a/gs/src/inames.h +++ b/gs/src/inames.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Name table interface */ #ifndef inames_INCLUDED diff --git a/gs/src/inouparm.c b/gs/src/inouparm.c index cd1276ec2..b345ad6a1 100644 --- a/gs/src/inouparm.c +++ b/gs/src/inouparm.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Dummy set_user_params for Level 1 systems */ #include "ghost.h" #include "icontext.h" /* for set_user_params prototype */ diff --git a/gs/src/interp.c b/gs/src/interp.c index 1f47b0f31..69b2c58bf 100644 --- a/gs/src/interp.c +++ b/gs/src/interp.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Ghostscript language interpreter */ #include "memory_.h" #include "string_.h" diff --git a/gs/src/interp.h b/gs/src/interp.h index f025a622b..fcfffe4f6 100644 --- a/gs/src/interp.h +++ b/gs/src/interp.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Internal interfaces to interp.c and iinit.c */ #ifndef interp_INCLUDED diff --git a/gs/src/iostack.h b/gs/src/iostack.h index 55611b6a4..4b27eb2d2 100644 --- a/gs/src/iostack.h +++ b/gs/src/iostack.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic operand stack API */ #ifndef iostack_INCLUDED diff --git a/gs/src/ipacked.h b/gs/src/ipacked.h index 0c61b97b0..39587eb42 100644 --- a/gs/src/ipacked.h +++ b/gs/src/ipacked.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Packed array format for Ghostscript */ #ifndef ipacked_INCLUDED diff --git a/gs/src/iparam.c b/gs/src/iparam.c index 6adbd3432..f9e76722a 100644 --- a/gs/src/iparam.c +++ b/gs/src/iparam.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interpreter implementations of parameter dictionaries */ #include "memory_.h" #include "string_.h" diff --git a/gs/src/iparam.h b/gs/src/iparam.h index 902458a0a..b7d1c2aba 100644 --- a/gs/src/iparam.h +++ b/gs/src/iparam.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires ialloc.h, istack.h */ #ifndef iparam_INCLUDED diff --git a/gs/src/iparray.h b/gs/src/iparray.h index 5b6b2bac5..8f114ff60 100644 --- a/gs/src/iparray.h +++ b/gs/src/iparray.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Packed array constructor for Ghostscript */ #ifndef iparray_INCLUDED diff --git a/gs/src/ireclaim.c b/gs/src/ireclaim.c index f2ee6d89d..b12fa3f3c 100644 --- a/gs/src/ireclaim.c +++ b/gs/src/ireclaim.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interpreter's interface to garbage collector */ #include "ghost.h" #include "errors.h" diff --git a/gs/src/iref.h b/gs/src/iref.h index 131b185d1..928a4ecca 100644 --- a/gs/src/iref.h +++ b/gs/src/iref.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Object structure and type definitions for Ghostscript */ #ifndef iref_INCLUDED diff --git a/gs/src/isave.c b/gs/src/isave.c index 3b58fffe9..34fcba47b 100644 --- a/gs/src/isave.c +++ b/gs/src/isave.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Save/restore manager for Ghostscript interpreter */ #include "ghost.h" #include "memory_.h" diff --git a/gs/src/isave.h b/gs/src/isave.h index d35a984e3..b9af450a4 100644 --- a/gs/src/isave.h +++ b/gs/src/isave.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires imemory.h */ #ifndef isave_INCLUDED diff --git a/gs/src/iscan.c b/gs/src/iscan.c index ffee21fd7..ad2e5a027 100644 --- a/gs/src/iscan.c +++ b/gs/src/iscan.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Token scanner for Ghostscript interpreter */ #include "ghost.h" #include "memory_.h" diff --git a/gs/src/iscan.h b/gs/src/iscan.h index a269e9f17..e60d1c21b 100644 --- a/gs/src/iscan.h +++ b/gs/src/iscan.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires gsstruct.h, ostack.h, stream.h */ #ifndef iscan_INCLUDED diff --git a/gs/src/iscanbin.c b/gs/src/iscanbin.c index e53d3e46f..1c8036b1e 100644 --- a/gs/src/iscanbin.c +++ b/gs/src/iscanbin.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Ghostscript binary token scanner and writer */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/iscannum.c b/gs/src/iscannum.c index b41b74c3a..d4141ec7c 100644 --- a/gs/src/iscannum.c +++ b/gs/src/iscannum.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Number scanner for Ghostscript interpreter */ #include "math_.h" #include "ghost.h" diff --git a/gs/src/iscannum.h b/gs/src/iscannum.h index ba25ed6c1..03d967153 100644 --- a/gs/src/iscannum.h +++ b/gs/src/iscannum.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to Ghostscript number scanner */ #ifndef iscannum_INCLUDED diff --git a/gs/src/isstate.h b/gs/src/isstate.h index bc44de664..af2e57cee 100644 --- a/gs/src/isstate.h +++ b/gs/src/isstate.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires isave.h */ #ifndef isstate_INCLUDED diff --git a/gs/src/istack.c b/gs/src/istack.c index 5d70d512f..d73c560cb 100644 --- a/gs/src/istack.c +++ b/gs/src/istack.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Ghostscript expandable stack manager */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/istack.h b/gs/src/istack.h index 7b98bb83d..f79010caa 100644 --- a/gs/src/istack.h +++ b/gs/src/istack.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for expandable Ghostscript stacks */ /* Requires iref.h */ diff --git a/gs/src/istream.h b/gs/src/istream.h index 680b4de81..2b2acebfb 100644 --- a/gs/src/istream.h +++ b/gs/src/istream.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires scommon.h, ostack.h */ #ifndef istream_INCLUDED diff --git a/gs/src/istruct.h b/gs/src/istruct.h index 86842a02b..f5c4bd6fc 100644 --- a/gs/src/istruct.h +++ b/gs/src/istruct.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interpreter-level extension of gsstruct.h */ #ifndef istruct_INCLUDED diff --git a/gs/src/iutil.c b/gs/src/iutil.c index e65990984..3510223d9 100644 --- a/gs/src/iutil.c +++ b/gs/src/iutil.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Utilities for Ghostscript interpreter */ #include "math_.h" /* for fabs */ #include "memory_.h" diff --git a/gs/src/iutil.h b/gs/src/iutil.h index c31918f94..31b9b62da 100644 --- a/gs/src/iutil.h +++ b/gs/src/iutil.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires imemory.h, ostack.h */ #ifndef iutil_INCLUDED diff --git a/gs/src/iutil2.c b/gs/src/iutil2.c index c1bdd004b..e2c17254f 100644 --- a/gs/src/iutil2.c +++ b/gs/src/iutil2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Level 2 utilities for Ghostscript interpreter */ #include "memory_.h" #include "string_.h" diff --git a/gs/src/iutil2.h b/gs/src/iutil2.h index 73b3fdad7..587474271 100644 --- a/gs/src/iutil2.h +++ b/gs/src/iutil2.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface to procedures in iutil2.c */ #ifndef iutil2_INCLUDED diff --git a/gs/src/ivmspace.h b/gs/src/ivmspace.h index 11ddfe187..60b22d0d4 100644 --- a/gs/src/ivmspace.h +++ b/gs/src/ivmspace.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Local/global space management */ /* Requires iref.h */ diff --git a/gs/src/jpeg.mak b/gs/src/jpeg.mak index 111906c2c..6f42f61bd 100644 --- a/gs/src/jpeg.mak +++ b/gs/src/jpeg.mak @@ -33,17 +33,17 @@ # # You can get the IJG library by Internet anonymous FTP from the following # places: -# Standard distribution (tar + gzip format, Unix end-of-line): -# ftp.uu.net:/graphics/jpeg/jpegsrc.v*.tar.gz -# ftp.cs.wisc.edu:/ghost/jpegsrc.v*.tar.gz -# MS-DOS archive (PKZIP a.k.a. zip format, MS-DOS end-of-line): -# ftp.simtel.net:/pub/simtelnet/msdos/graphics/jpegsr*.zip -# ftp.cs.wisc.edu:/ghost/jpeg-*.zip -# The first site named above (ftp.uu.net and ftp.simtel.net) is supposed -# to be the master distribution site, so it may have a more up-to-date -# version; the ftp.cs.wisc.edu site is the master distribution site for -# Ghostscript, so it will always have IJG library versions known to be -# compatible with Ghostscript. +# Standard distribution (tar + gzip format, Unix end-of-line): +# ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v*.tar.gz +# MS-DOS archive (PKZIP a.k.a. zip format, MS-DOS end-of-line): +# ftp://ftp.simtel.net/pub/simtelnet/msdos/graphics/jpegsr*.zip +# Please see Ghostscript's `make.txt' file for instructions about how to +# unpack these archives. +# +# When each version of Ghostscript is released, we copy the associated +# version of the IJG library to +# ftp://ftp.cs.wisc.edu/ghost/3rdparty/ +# for more convenient access. # # If the version number, and hence the subdirectory name, changes, you # will probably want to change the definitions of JSRCDIR and possibly diff --git a/gs/src/libpng.mak b/gs/src/libpng.mak index 304143c87..5946c70ab 100644 --- a/gs/src/libpng.mak +++ b/gs/src/libpng.mak @@ -31,8 +31,17 @@ # This partial makefile compiles the png library for use in the Ghostscript # PNG drivers. You can get the source code for this library from: # ftp://swrinde.nde.swri.edu/pub/png/src/ +# ftp://ftp.uu.net/graphics/png/src/ +# Please see Ghostscript's `make.txt' file for instructions about how to +# unpack these archives. +# +# When each version of Ghostscript is released, we copy the associated +# version of the png library to +# ftp://ftp.cs.wisc.edu/ghost/3rdparty/ +# for more convenient access. +# # The makefile is known to work with the following library versions: -# 0.89, 0.90, 0.95, 0.96, and 1.0.1. NOTE: the archive for libpng 0.95 may +# 0.89, 0.90, 0.95, 0.96, 1.0.1, 1.0.2. NOTE: the archive for libpng 0.95 may # be inconsistent: if you have compilation problems, use an older version. # Please see Ghostscript's `make.txt' file for instructions about how to # unpack these archives. diff --git a/gs/src/main.h b/gs/src/main.h index 1f7b8e7c0..cccfce176 100644 --- a/gs/src/main.h +++ b/gs/src/main.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Backward-compatible interface to gsmain.c */ #ifndef main_INCLUDED diff --git a/gs/src/malloc_.h b/gs/src/malloc_.h index 0fd4ed860..7ccb13fea 100644 --- a/gs/src/malloc_.h +++ b/gs/src/malloc_.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic substitute for Unix malloc.h */ #ifndef malloc__INCLUDED diff --git a/gs/src/math_.h b/gs/src/math_.h index d5c77f8a4..c72e0b0b2 100644 --- a/gs/src/math_.h +++ b/gs/src/math_.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic substitute for math.h */ #ifndef math__INCLUDED diff --git a/gs/src/memory_.h b/gs/src/memory_.h index 8a7c0f6ee..9291660a4 100644 --- a/gs/src/memory_.h +++ b/gs/src/memory_.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic substitute for Unix memory.h */ #ifndef memory__INCLUDED diff --git a/gs/src/opcheck.h b/gs/src/opcheck.h index 078f68130..6e9283e53 100644 --- a/gs/src/opcheck.h +++ b/gs/src/opcheck.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires ialloc.h (for imemory), iref.h, errors.h */ #ifndef opcheck_INCLUDED diff --git a/gs/src/opdef.h b/gs/src/opdef.h index ef8e6511f..b12e721d2 100644 --- a/gs/src/opdef.h +++ b/gs/src/opdef.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Operator definition interface for Ghostscript */ #ifndef opdef_INCLUDED diff --git a/gs/src/oper.h b/gs/src/oper.h index 837231a2c..0b2abcd7b 100644 --- a/gs/src/oper.h +++ b/gs/src/oper.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for Ghostscript operators */ #ifndef oper_INCLUDED diff --git a/gs/src/opextern.h b/gs/src/opextern.h index b6043e75a..72f555576 100644 --- a/gs/src/opextern.h +++ b/gs/src/opextern.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Externally accessible operator declarations */ #ifndef opextern_INCLUDED diff --git a/gs/src/ostack.h b/gs/src/ostack.h index 48710a9b9..3f6b9d754 100644 --- a/gs/src/ostack.h +++ b/gs/src/ostack.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for Ghostscript operand stack */ #ifndef ostack_INCLUDED diff --git a/gs/src/pipe_.h b/gs/src/pipe_.h index 5d827d45f..17679bcdc 100644 --- a/gs/src/pipe_.h +++ b/gs/src/pipe_.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Declaration of popen and pclose */ #ifndef pipe__INCLUDED diff --git a/gs/src/sa85x.h b/gs/src/sa85x.h index b6a879bfe..32ac45354 100644 --- a/gs/src/sa85x.h +++ b/gs/src/sa85x.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires scommon.h; strimpl.h if any templates are referenced */ #ifndef sa85x_INCLUDED diff --git a/gs/src/sbcp.c b/gs/src/sbcp.c index 52ce3a56c..901b78046 100644 --- a/gs/src/sbcp.c +++ b/gs/src/sbcp.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* BCP and TBCP filters */ #include "stdio_.h" #include "strimpl.h" diff --git a/gs/src/sbhc.c b/gs/src/sbhc.c index 02c5fc8a7..42508a874 100644 --- a/gs/src/sbhc.c +++ b/gs/src/sbhc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Bounded Huffman code filters */ #include "memory_.h" #include "stdio_.h" diff --git a/gs/src/sbhc.h b/gs/src/sbhc.h index 8d259ed62..70b298d8f 100644 --- a/gs/src/sbhc.h +++ b/gs/src/sbhc.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires strimpl.h */ #ifndef sbhc_INCLUDED diff --git a/gs/src/sbtx.h b/gs/src/sbtx.h index c242c2e41..c43347b60 100644 --- a/gs/src/sbtx.h +++ b/gs/src/sbtx.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires scommon.h; strimpl.h if any templates are referenced */ #ifndef sbtx_INCLUDED diff --git a/gs/src/sbwbs.c b/gs/src/sbwbs.c index 8e4139f6e..f3c4d33ec 100644 --- a/gs/src/sbwbs.c +++ b/gs/src/sbwbs.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Burrows/Wheeler block sorting compression filters */ #include "stdio_.h" #include "memory_.h" diff --git a/gs/src/sbwbs.h b/gs/src/sbwbs.h index c6dcc656b..d4ac662fd 100644 --- a/gs/src/sbwbs.h +++ b/gs/src/sbwbs.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires scommon.h; strimpl.h if any templates are referenced */ #ifndef sbwbs_INCLUDED diff --git a/gs/src/scanchar.h b/gs/src/scanchar.h index 345a99625..93553da49 100644 --- a/gs/src/scanchar.h +++ b/gs/src/scanchar.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires scommon.h */ #ifndef scanchar_INCLUDED diff --git a/gs/src/scantab.c b/gs/src/scantab.c index 82f1acb8b..f88e7cf65 100644 --- a/gs/src/scantab.c +++ b/gs/src/scantab.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Scanner table for PostScript/PDF tokens */ #include "stdpre.h" #include "scommon.h" diff --git a/gs/src/scf.h b/gs/src/scf.h index fbe6e390f..eaa591831 100644 --- a/gs/src/scf.h +++ b/gs/src/scf.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Common definitions for CCITTFax encoding and decoding filters */ #ifndef scf_INCLUDED diff --git a/gs/src/scfd.c b/gs/src/scfd.c index 20802d7fa..9d24bd943 100644 --- a/gs/src/scfd.c +++ b/gs/src/scfd.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* CCITTFax decoding filter */ #include "stdio_.h" /* includes std.h */ #include "memory_.h" diff --git a/gs/src/scfdgen.c b/gs/src/scfdgen.c index 50c2d81d5..effd975dc 100644 --- a/gs/src/scfdgen.c +++ b/gs/src/scfdgen.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generate the CCITTFaxDecode tables */ #include "stdio_.h" /* includes std.h */ #include "scf.h" diff --git a/gs/src/scfdtab.c b/gs/src/scfdtab.c index 1d6dc99f7..6ba584780 100644 --- a/gs/src/scfdtab.c +++ b/gs/src/scfdtab.c @@ -4,7 +4,7 @@ /* as the files scftab.c and scfdgen.c from which it was derived. */ /* Consult those files for the licensing terms and conditions. */ -/*$Id$ */ + /* Tables for CCITTFaxDecode filter. */ #include "std.h" diff --git a/gs/src/scfe.c b/gs/src/scfe.c index c8a2cdb27..ebb7b8342 100644 --- a/gs/src/scfe.c +++ b/gs/src/scfe.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* CCITTFax encoding filter */ #include "stdio_.h" /* includes std.h */ #include "memory_.h" diff --git a/gs/src/scfetab.c b/gs/src/scfetab.c index bf4fb7d66..21adc6384 100644 --- a/gs/src/scfetab.c +++ b/gs/src/scfetab.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Tables for CCITTFaxEncode filter */ #include "std.h" #include "scommon.h" /* for scf.h */ diff --git a/gs/src/scfparam.c b/gs/src/scfparam.c index eb3b2c6fb..b8b93ef3e 100644 --- a/gs/src/scfparam.c +++ b/gs/src/scfparam.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* CCITTFax filter parameter setting and reading */ #include "std.h" #include "gserror.h" diff --git a/gs/src/scfx.h b/gs/src/scfx.h index 6cbe6297a..abf7ada32 100644 --- a/gs/src/scfx.h +++ b/gs/src/scfx.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* CCITTFax filter state definition */ /* Requires strimpl.h */ diff --git a/gs/src/scommon.h b/gs/src/scommon.h index e508d8927..98c0772d9 100644 --- a/gs/src/scommon.h +++ b/gs/src/scommon.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions common to stream clients and implementors */ #ifndef scommon_DEFINED diff --git a/gs/src/sdcparam.c b/gs/src/sdcparam.c index 95e5416df..b70f567db 100644 --- a/gs/src/sdcparam.c +++ b/gs/src/sdcparam.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* DCT filter parameter setting and reading */ #include "memory_.h" #include "jpeglib.h" diff --git a/gs/src/sdcparam.h b/gs/src/sdcparam.h index eeb0abc6d..1d45343d5 100644 --- a/gs/src/sdcparam.h +++ b/gs/src/sdcparam.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* DCT filter parameter setting and reading interface */ #ifndef sdcparam_INCLUDED diff --git a/gs/src/sdct.h b/gs/src/sdct.h index 7a183f1c0..47bd17166 100644 --- a/gs/src/sdct.h +++ b/gs/src/sdct.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires stream.h, strimpl.h, jpeg/jpeglib.h */ #ifndef sdct_INCLUDED diff --git a/gs/src/sdctc.c b/gs/src/sdctc.c index 9d520c266..18ecc6c25 100644 --- a/gs/src/sdctc.c +++ b/gs/src/sdctc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Code common to DCT encoding and decoding streams */ #include "stdio_.h" #include "gsmemory.h" diff --git a/gs/src/sdctd.c b/gs/src/sdctd.c index efe68cd45..b02945c00 100644 --- a/gs/src/sdctd.c +++ b/gs/src/sdctd.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* DCT decoding filter stream */ #include "memory_.h" #include "stdio_.h" diff --git a/gs/src/sdcte.c b/gs/src/sdcte.c index c3512deb5..7363254c2 100644 --- a/gs/src/sdcte.c +++ b/gs/src/sdcte.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* DCT encoding filter stream */ #include "memory_.h" #include "stdio_.h" diff --git a/gs/src/sddparam.c b/gs/src/sddparam.c index d5f5e5f1c..c006a2edb 100644 --- a/gs/src/sddparam.c +++ b/gs/src/sddparam.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* DCTDecode filter parameter setting and reading */ #include "std.h" #include "jpeglib.h" diff --git a/gs/src/sdeparam.c b/gs/src/sdeparam.c index f298a3899..64a55ddce 100644 --- a/gs/src/sdeparam.c +++ b/gs/src/sdeparam.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* DCTEncode filter parameter setting and reading */ #include "memory_.h" #include "jpeglib.h" diff --git a/gs/src/seexec.c b/gs/src/seexec.c index 3574fd0d4..d545a4208 100644 --- a/gs/src/seexec.c +++ b/gs/src/seexec.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* eexec filters */ #include "stdio_.h" /* includes std.h */ #include "strimpl.h" diff --git a/gs/src/sfilter.h b/gs/src/sfilter.h index 9af84f25a..ebb0ec042 100644 --- a/gs/src/sfilter.h +++ b/gs/src/sfilter.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for simple Ghostscript streams */ /* Requires scommon.h; should require strimpl.h only if any templates */ /* are referenced, but some compilers always require strimpl.h. */ diff --git a/gs/src/sfilter1.c b/gs/src/sfilter1.c index 3a9c1ce08..3e64e51c9 100644 --- a/gs/src/sfilter1.c +++ b/gs/src/sfilter1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Filters included in Level 1 systems: NullEncode/Decode, PFBDecode, */ /* SubFileDecode. */ #include "stdio_.h" /* includes std.h */ diff --git a/gs/src/sfilter2.c b/gs/src/sfilter2.c index 6737fe5ee..ca288e8e3 100644 --- a/gs/src/sfilter2.c +++ b/gs/src/sfilter2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Simple Level 2 filters */ #include "stdio_.h" /* includes std.h */ #include "memory_.h" diff --git a/gs/src/sfxboth.c b/gs/src/sfxboth.c index 6ac350474..42c677584 100644 --- a/gs/src/sfxboth.c +++ b/gs/src/sfxboth.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* File stream implementation using both stdio and direct OS calls */ #include "sfxstdio.c" diff --git a/gs/src/sfxfd.c b/gs/src/sfxfd.c index c37673e28..9147dd40e 100644 --- a/gs/src/sfxfd.c +++ b/gs/src/sfxfd.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* File stream implementation using direct OS calls */ /****** ****** NOTE: THIS FILE PROBABLY WILL NOT COMPILE ON NON-UNIX diff --git a/gs/src/sfxstdio.c b/gs/src/sfxstdio.c index 5cbb949fa..aad11dd2e 100644 --- a/gs/src/sfxstdio.c +++ b/gs/src/sfxstdio.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* File stream implementation using stdio */ #include "stdio_.h" /* includes std.h */ #include "memory_.h" diff --git a/gs/src/shc.c b/gs/src/shc.c index 2c375ba1d..933fd98f3 100644 --- a/gs/src/shc.c +++ b/gs/src/shc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Support code for shc.h */ #include "std.h" #include "scommon.h" diff --git a/gs/src/shc.h b/gs/src/shc.h index e5e8654f7..abb709197 100644 --- a/gs/src/shc.h +++ b/gs/src/shc.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Common definitions for filters using Huffman coding */ #ifndef shc_INCLUDED diff --git a/gs/src/shcgen.c b/gs/src/shcgen.c index 9ad9c0143..62eef1923 100644 --- a/gs/src/shcgen.c +++ b/gs/src/shcgen.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generate (bounded) Huffman code definitions from frequencies, */ /* and tables from definitions. */ #include "memory_.h" diff --git a/gs/src/shcgen.h b/gs/src/shcgen.h index 30b56134e..06aa2a96d 100644 --- a/gs/src/shcgen.h +++ b/gs/src/shcgen.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires shc.h */ #ifndef shcgen_INCLUDED diff --git a/gs/src/siscale.c b/gs/src/siscale.c index edfa50b4f..7f9525b5d 100644 --- a/gs/src/siscale.c +++ b/gs/src/siscale.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Image scaling filters */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/siscale.h b/gs/src/siscale.h index a9a00a124..4084248d6 100644 --- a/gs/src/siscale.h +++ b/gs/src/siscale.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires strimpl.h */ #ifndef siscale_INCLUDED diff --git a/gs/src/sjpeg.h b/gs/src/sjpeg.h index d34fcd76d..7298ccea6 100644 --- a/gs/src/sjpeg.h +++ b/gs/src/sjpeg.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires sdct.h, jpeg/jpeglib.h */ #ifndef sjpeg_INCLUDED diff --git a/gs/src/sjpegc.c b/gs/src/sjpegc.c index e09903ae3..655ddaaaf 100644 --- a/gs/src/sjpegc.c +++ b/gs/src/sjpegc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface routines for IJG code, common to encode/decode. */ #include "stdio_.h" #include "string_.h" diff --git a/gs/src/sjpegd.c b/gs/src/sjpegd.c index 7646d8d9c..e5ff4d206 100644 --- a/gs/src/sjpegd.c +++ b/gs/src/sjpegd.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface routines for IJG decoding code. */ #include "stdio_.h" #include "string_.h" diff --git a/gs/src/sjpege.c b/gs/src/sjpege.c index 2a296a9a9..b4e374d40 100644 --- a/gs/src/sjpege.c +++ b/gs/src/sjpege.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Interface routines for IJG encoding code. */ #include "stdio_.h" #include "string_.h" diff --git a/gs/src/sjpegerr.c b/gs/src/sjpegerr.c index 33d53b743..fa16d4e2e 100644 --- a/gs/src/sjpegerr.c +++ b/gs/src/sjpegerr.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* IJG error message table for Ghostscript. */ #include "stdio_.h" #include "jpeglib.h" diff --git a/gs/src/slzwc.c b/gs/src/slzwc.c index b7204844c..66f37e3c1 100644 --- a/gs/src/slzwc.c +++ b/gs/src/slzwc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Code common to LZW encoding and decoding streams */ #include "std.h" #include "strimpl.h" diff --git a/gs/src/slzwce.c b/gs/src/slzwce.c index 8e31b978e..91c4252b5 100644 --- a/gs/src/slzwce.c +++ b/gs/src/slzwce.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Simple encoder compatible with LZW decoding filter */ #include "stdio_.h" /* includes std.h */ #include "gdebug.h" diff --git a/gs/src/slzwd.c b/gs/src/slzwd.c index 7be5a5dbf..895756a8f 100644 --- a/gs/src/slzwd.c +++ b/gs/src/slzwd.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* LZW decoding filter */ #include "stdio_.h" /* includes std.h */ #include "gdebug.h" diff --git a/gs/src/slzwx.h b/gs/src/slzwx.h index 709701475..376b47acb 100644 --- a/gs/src/slzwx.h +++ b/gs/src/slzwx.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires strimpl.h */ #ifndef slzwx_INCLUDED diff --git a/gs/src/smtf.c b/gs/src/smtf.c index 8cffd4067..6c1f76019 100644 --- a/gs/src/smtf.c +++ b/gs/src/smtf.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* MoveToFront filters */ #include "stdio_.h" #include "strimpl.h" diff --git a/gs/src/smtf.h b/gs/src/smtf.h index 5822fb465..764ddf321 100644 --- a/gs/src/smtf.h +++ b/gs/src/smtf.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires scommon.h; strimpl.h if any templates are referenced */ #ifndef smtf_INCLUDED diff --git a/gs/src/spcxd.c b/gs/src/spcxd.c index 49a6c31f0..6941e4021 100644 --- a/gs/src/spcxd.c +++ b/gs/src/spcxd.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* PCXDecode filter */ #include "stdio_.h" /* includes std.h */ #include "memory_.h" diff --git a/gs/src/spcxx.h b/gs/src/spcxx.h index c24639ae8..d4b1ad458 100644 --- a/gs/src/spcxx.h +++ b/gs/src/spcxx.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires scommon.h; strimpl.h if any templates are referenced */ #ifndef spcxx_INCLUDED diff --git a/gs/src/spdiff.c b/gs/src/spdiff.c index 2b43159f6..c72ecf1f3 100644 --- a/gs/src/spdiff.c +++ b/gs/src/spdiff.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Pixel differencing filters */ #include "stdio_.h" /* should be std.h, but needs NULL */ #include "strimpl.h" diff --git a/gs/src/spdiffx.h b/gs/src/spdiffx.h index a3ababad4..41cbcee4b 100644 --- a/gs/src/spdiffx.h +++ b/gs/src/spdiffx.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires strimpl.h */ #ifndef spdiffx_INCLUDED diff --git a/gs/src/spngp.c b/gs/src/spngp.c index 87a3f6911..e12e00314 100644 --- a/gs/src/spngp.c +++ b/gs/src/spngp.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* PNG pixel prediction filters */ #include "memory_.h" #include "strimpl.h" diff --git a/gs/src/spngpx.h b/gs/src/spngpx.h index 6eae9cfbf..689489e76 100644 --- a/gs/src/spngpx.h +++ b/gs/src/spngpx.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires strimpl.h */ #ifndef spngpx_INCLUDED diff --git a/gs/src/srld.c b/gs/src/srld.c index e08d96cbf..159dc739e 100644 --- a/gs/src/srld.c +++ b/gs/src/srld.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* RunLengthDecode filter */ #include "stdio_.h" /* includes std.h */ #include "memory_.h" diff --git a/gs/src/srle.c b/gs/src/srle.c index cd964854d..b484710c4 100644 --- a/gs/src/srle.c +++ b/gs/src/srle.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* RunLengthEncode filter */ #include "stdio_.h" /* includes std.h */ #include "memory_.h" diff --git a/gs/src/srlx.h b/gs/src/srlx.h index 9c668122d..aefa6a750 100644 --- a/gs/src/srlx.h +++ b/gs/src/srlx.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Requires scommon.h; strimpl.h if any templates are referenced */ #ifndef srlx_INCLUDED diff --git a/gs/src/sstring.c b/gs/src/sstring.c index 0414cfc08..49cd51d82 100644 --- a/gs/src/sstring.c +++ b/gs/src/sstring.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* String and hexstring streams (filters) */ #include "stdio_.h" /* includes std.h */ #include "memory_.h" diff --git a/gs/src/sstring.h b/gs/src/sstring.h index 319adf48c..b9270d6e3 100644 --- a/gs/src/sstring.h +++ b/gs/src/sstring.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* are referenced, but some compilers always require strimpl.h. */ #ifndef sstring_INCLUDED diff --git a/gs/src/stat_.h b/gs/src/stat_.h index 221c6fb3d..d06083658 100644 --- a/gs/src/stat_.h +++ b/gs/src/stat_.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic substitute for Unix sys/stat.h */ #ifndef stat__INCLUDED diff --git a/gs/src/std.h b/gs/src/std.h index 93e8e0c8b..e7f7d9ed1 100644 --- a/gs/src/std.h +++ b/gs/src/std.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Standard definitions for Aladdin Enterprises code */ #ifndef std_INCLUDED diff --git a/gs/src/stdio_.h b/gs/src/stdio_.h index 7744b0df9..ca7c29b73 100644 --- a/gs/src/stdio_.h +++ b/gs/src/stdio_.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic substitute for stdio.h */ #ifndef stdio__INCLUDED diff --git a/gs/src/stdpre.h b/gs/src/stdpre.h index 9c93952fc..b2fcda9a8 100644 --- a/gs/src/stdpre.h +++ b/gs/src/stdpre.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Standard definitions for Aladdin Enterprises code not needing arch.h */ #ifndef stdpre_INCLUDED diff --git a/gs/src/store.h b/gs/src/store.h index 3c610fc73..422e9cb42 100644 --- a/gs/src/store.h +++ b/gs/src/store.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Assignment-related macros */ #ifndef store_INCLUDED diff --git a/gs/src/stream.c b/gs/src/stream.c index cdc7b30c5..10d09a76f 100644 --- a/gs/src/stream.c +++ b/gs/src/stream.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Stream package for Ghostscript interpreter */ #include "stdio_.h" /* includes std.h */ #include "memory_.h" diff --git a/gs/src/stream.h b/gs/src/stream.h index 4a2c79221..4767fe3e5 100644 --- a/gs/src/stream.h +++ b/gs/src/stream.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for Ghostscript stream package */ /* Requires stdio.h */ diff --git a/gs/src/strimpl.h b/gs/src/strimpl.h index 7a749801e..55e0301d3 100644 --- a/gs/src/strimpl.h +++ b/gs/src/strimpl.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Definitions for stream implementors */ /* Requires stdio.h */ diff --git a/gs/src/string_.h b/gs/src/string_.h index bae2233a2..c40afaaa2 100644 --- a/gs/src/string_.h +++ b/gs/src/string_.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic substitute for Unix string.h */ #ifndef string__INCLUDED diff --git a/gs/src/szlibc.c b/gs/src/szlibc.c index 0a2dba822..c4bcbcd66 100644 --- a/gs/src/szlibc.c +++ b/gs/src/szlibc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Code common to zlib encoding and decoding streams */ #include "std.h" #include "gserror.h" diff --git a/gs/src/szlibd.c b/gs/src/szlibd.c index a455cdca6..5502b1807 100644 --- a/gs/src/szlibd.c +++ b/gs/src/szlibd.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* zlib decoding (decompression) filter stream */ #include "std.h" #include "gsmemory.h" diff --git a/gs/src/szlibe.c b/gs/src/szlibe.c index 24909ba12..18f3efa8a 100644 --- a/gs/src/szlibe.c +++ b/gs/src/szlibe.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* zlib encoding (compression) filter stream */ #include "std.h" #include "gsmemory.h" diff --git a/gs/src/szlibx.h b/gs/src/szlibx.h index 827d21fa7..8de6b86c2 100644 --- a/gs/src/szlibx.h +++ b/gs/src/szlibx.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* zlib filter state definition */ #ifndef szlibx_INCLUDED diff --git a/gs/src/time_.h b/gs/src/time_.h index 2d85b8faf..ac3e19523 100644 --- a/gs/src/time_.h +++ b/gs/src/time_.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic substitute for Unix sys/time.h */ #ifndef time__INCLUDED diff --git a/gs/src/unix-gcc.mak b/gs/src/unix-gcc.mak index 1a9c4c2bf..b624319c1 100755 --- a/gs/src/unix-gcc.mak +++ b/gs/src/unix-gcc.mak @@ -268,7 +268,7 @@ FPU_TYPE=1 # Choose the language feature(s) to include. See gs.mak for details. -#FEATURE_DEVS=psl3.dev pdf.dev dpsnext.dev epsf.dev pipe.dev rasterop.dev +#FEATURE_DEVS=psl3.dev pdf.dev dpsnext.dev pipe.dev rasterop.dev FEATURE_DEVS=psl3.dev pdf.dev dpsnext.dev pipe.dev # Choose whether to compile the .ps initialization files into the executable. @@ -295,7 +295,7 @@ FILE_IMPLEMENTATION=stdio # Choose the device(s) to include. See devs.mak for details, # devs.mak and contrib.mak for the list of available devices. -DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev +DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11gray4.dev x11mono.dev #DEVICE_DEVS1=bmpmono.dev bmpamono.dev posync.dev DEVICE_DEVS1= DEVICE_DEVS2= diff --git a/gs/src/version.mak b/gs/src/version.mak index fc4c66b22..e50ff81e5 100644 --- a/gs/src/version.mak +++ b/gs/src/version.mak @@ -24,10 +24,10 @@ VERSION_MAK=$(GLSRC)version.mak # Major and minor version numbers. # MINOR0 is different from MINOR only if MINOR is a single digit. GS_VERSION_MAJOR=5 -GS_VERSION_MINOR=34 -GS_VERSION_MINOR0=34 +GS_VERSION_MINOR=35 +GS_VERSION_MINOR0=35 # Revision date: year x 10000 + month x 100 + day. -GS_REVISIONDATE=19980816 +GS_REVISIONDATE=19980818 # Derived values GS_VERSION=$(GS_VERSION_MAJOR)$(GS_VERSION_MINOR0) diff --git a/gs/src/vmsmath.h b/gs/src/vmsmath.h index 61c548989..fd4872bb2 100644 --- a/gs/src/vmsmath.h +++ b/gs/src/vmsmath.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Substitute for math.h on VAX/VMS systems */ #ifndef vmsmath_INCLUDED diff --git a/gs/src/windows_.h b/gs/src/windows_.h index 0425b501d..8b2af18d2 100644 --- a/gs/src/windows_.h +++ b/gs/src/windows_.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Wrapper for windows.h */ #ifndef windows__INCLUDED diff --git a/gs/src/x_.h b/gs/src/x_.h index b8b2fc307..efcd74349 100644 --- a/gs/src/x_.h +++ b/gs/src/x_.h @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Header for including X library calls in Ghostscript X11 driver */ #ifndef x__INCLUDED diff --git a/gs/src/zarith.c b/gs/src/zarith.c index ea06821ed..661b35a99 100644 --- a/gs/src/zarith.c +++ b/gs/src/zarith.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Arithmetic operators */ #include "math_.h" #include "ghost.h" diff --git a/gs/src/zarray.c b/gs/src/zarray.c index 9bb50203f..e17dad409 100644 --- a/gs/src/zarray.c +++ b/gs/src/zarray.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Array operators */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zbseq.c b/gs/src/zbseq.c index bcb60b94c..d68449e05 100644 --- a/gs/src/zbseq.c +++ b/gs/src/zbseq.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Level 2 binary object sequence operators */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zcfont.c b/gs/src/zcfont.c index eb597151c..9822ae172 100644 --- a/gs/src/zcfont.c +++ b/gs/src/zcfont.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Composite font-related character operators */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zchar.c b/gs/src/zchar.c index 43bb9d1b2..235db74e3 100644 --- a/gs/src/zchar.c +++ b/gs/src/zchar.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Character operators */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zchar1.c b/gs/src/zchar1.c index 1b5207d41..1a210bf6b 100644 --- a/gs/src/zchar1.c +++ b/gs/src/zchar1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Type 1 character display operator */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zchar2.c b/gs/src/zchar2.c index 4aa0baecd..39e2bfe8e 100644 --- a/gs/src/zchar2.c +++ b/gs/src/zchar2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Level 2 character operators */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zchar32.c b/gs/src/zchar32.c index efe9d2647..1f510ef35 100644 --- a/gs/src/zchar32.c +++ b/gs/src/zchar32.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Type 32 font glyph operators */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zchar42.c b/gs/src/zchar42.c index 30de0bc05..9c6562424 100644 --- a/gs/src/zchar42.c +++ b/gs/src/zchar42.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Type 42 character display operator */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zcharout.c b/gs/src/zcharout.c index 4322b3adb..c6080ccc0 100644 --- a/gs/src/zcharout.c +++ b/gs/src/zcharout.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Common code for outline (Type 1 / 4 / 42) fonts */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zcid.c b/gs/src/zcid.c index 5da8942eb..18ae0ec21 100644 --- a/gs/src/zcid.c +++ b/gs/src/zcid.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* CID-keyed font operators */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zcie.c b/gs/src/zcie.c index 831b16570..6c9852d70 100644 --- a/gs/src/zcie.c +++ b/gs/src/zcie.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* CIE color operators */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/zcolor.c b/gs/src/zcolor.c index 688bf598a..d6b85e1ef 100644 --- a/gs/src/zcolor.c +++ b/gs/src/zcolor.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Color operators */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zcolor1.c b/gs/src/zcolor1.c index d369140a5..d1c931576 100644 --- a/gs/src/zcolor1.c +++ b/gs/src/zcolor1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Level 1 extended color operators */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zcolor2.c b/gs/src/zcolor2.c index 38a06a805..0c4f514cc 100644 --- a/gs/src/zcolor2.c +++ b/gs/src/zcolor2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Level 2 color operators */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zcontext.c b/gs/src/zcontext.c index 180aac410..ae665d62e 100644 --- a/gs/src/zcontext.c +++ b/gs/src/zcontext.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Display PostScript context operators */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zcontrol.c b/gs/src/zcontrol.c index 1f185eff2..f837a88ef 100644 --- a/gs/src/zcontrol.c +++ b/gs/src/zcontrol.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Control operators */ #include "string_.h" #include "ghost.h" diff --git a/gs/src/zcrd.c b/gs/src/zcrd.c index 9bbbadf52..8778c8f63 100644 --- a/gs/src/zcrd.c +++ b/gs/src/zcrd.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* CIE color rendering operators */ #include "math_.h" #include "ghost.h" diff --git a/gs/src/zcsdevn.c b/gs/src/zcsdevn.c index 24b8d853a..4b3a211aa 100644 --- a/gs/src/zcsdevn.c +++ b/gs/src/zcsdevn.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* DeviceN color space support */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zcsindex.c b/gs/src/zcsindex.c index a43030c39..17a0edbe2 100644 --- a/gs/src/zcsindex.c +++ b/gs/src/zcsindex.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Indexed color space support */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zcspixel.c b/gs/src/zcspixel.c index 94b28e95d..4b878c11e 100644 --- a/gs/src/zcspixel.c +++ b/gs/src/zcspixel.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* DevicePixel color space support */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zcssepr.c b/gs/src/zcssepr.c index 1a6a931a9..8702ef5db 100644 --- a/gs/src/zcssepr.c +++ b/gs/src/zcssepr.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Separation color space support */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zdevcal.c b/gs/src/zdevcal.c index 97574a28d..df802072b 100644 --- a/gs/src/zdevcal.c +++ b/gs/src/zdevcal.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* %Calendar% IODevice */ #include "time_.h" #include "ghost.h" diff --git a/gs/src/zdevice.c b/gs/src/zdevice.c index 647bf85ee..61e7bb904 100644 --- a/gs/src/zdevice.c +++ b/gs/src/zdevice.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Device-related operators */ #include "string_.h" #include "ghost.h" diff --git a/gs/src/zdevice2.c b/gs/src/zdevice2.c index 1258e5cf8..e9bff36fd 100644 --- a/gs/src/zdevice2.c +++ b/gs/src/zdevice2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Level 2 device operators */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/zdict.c b/gs/src/zdict.c index c110e32ba..0c9895f7a 100644 --- a/gs/src/zdict.c +++ b/gs/src/zdict.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Dictionary operators */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zdosio.c b/gs/src/zdosio.c index a8e435fa5..acd551b8e 100644 --- a/gs/src/zdosio.c +++ b/gs/src/zdosio.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* MS-DOS direct I/O operators. */ /* These should NEVER be included in a released configuration! */ #include "dos_.h" diff --git a/gs/src/zdouble.c b/gs/src/zdouble.c index bb5e52e07..7e8c70961 100644 --- a/gs/src/zdouble.c +++ b/gs/src/zdouble.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Double-precision floating point arithmetic operators */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/zdpnext.c b/gs/src/zdpnext.c index 4d8ae9b7d..d0eb4dbd5 100644 --- a/gs/src/zdpnext.c +++ b/gs/src/zdpnext.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* NeXT Display PostScript extensions */ #include "math_.h" #include "ghost.h" diff --git a/gs/src/zdps.c b/gs/src/zdps.c index e9e9ddf69..a03500374 100644 --- a/gs/src/zdps.c +++ b/gs/src/zdps.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Display PostScript extensions */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zdps1.c b/gs/src/zdps1.c index 5f4cf3cac..1f12c6b92 100644 --- a/gs/src/zdps1.c +++ b/gs/src/zdps1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Level 2 / Display PostScript graphics extensions */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zfbcp.c b/gs/src/zfbcp.c index 92b24f050..76056378a 100644 --- a/gs/src/zfbcp.c +++ b/gs/src/zfbcp.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* (T)BCP filter creation */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zfcmap.c b/gs/src/zfcmap.c index 8e6c542b3..01a815d49 100644 --- a/gs/src/zfcmap.c +++ b/gs/src/zfcmap.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* CMap creation operator */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zfdctd.c b/gs/src/zfdctd.c index 06fad7369..06b1d94cf 100644 --- a/gs/src/zfdctd.c +++ b/gs/src/zfdctd.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* DCTDecode filter creation */ #include "memory_.h" #include "stdio_.h" /* for jpeglib.h */ diff --git a/gs/src/zfdcte.c b/gs/src/zfdcte.c index 78b415d71..401b22878 100644 --- a/gs/src/zfdcte.c +++ b/gs/src/zfdcte.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* DCTEncode filter creation */ #include "memory_.h" #include "stdio_.h" /* for jpeglib.h */ diff --git a/gs/src/zfdecode.c b/gs/src/zfdecode.c index 0a701520d..4ff28856a 100644 --- a/gs/src/zfdecode.c +++ b/gs/src/zfdecode.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Additional decoding filter creation */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zfile.c b/gs/src/zfile.c index fc36e1bef..4e261bf59 100644 --- a/gs/src/zfile.c +++ b/gs/src/zfile.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Non-I/O file operators */ #include "memory_.h" #include "string_.h" diff --git a/gs/src/zfileio.c b/gs/src/zfileio.c index 72e589637..951b6b1f2 100644 --- a/gs/src/zfileio.c +++ b/gs/src/zfileio.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* File I/O operators */ #include "ghost.h" #include "gp.h" diff --git a/gs/src/zfilter.c b/gs/src/zfilter.c index 1d980b0cc..04b8fc998 100644 --- a/gs/src/zfilter.c +++ b/gs/src/zfilter.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Filter creation */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zfilter2.c b/gs/src/zfilter2.c index 338386393..31c0802a7 100644 --- a/gs/src/zfilter2.c +++ b/gs/src/zfilter2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Additional filter creation */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zfilterx.c b/gs/src/zfilterx.c index 64ef82660..a3d74a7cd 100644 --- a/gs/src/zfilterx.c +++ b/gs/src/zfilterx.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Extended (non-standard) filter creation */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zfname.c b/gs/src/zfname.c index 20c1ef456..ff211bd79 100644 --- a/gs/src/zfname.c +++ b/gs/src/zfname.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* File name utilities */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zfont.c b/gs/src/zfont.c index 1b3671c94..9f7efb652 100644 --- a/gs/src/zfont.c +++ b/gs/src/zfont.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic font operators */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zfont0.c b/gs/src/zfont0.c index a4cf46e1d..971c1ea78 100644 --- a/gs/src/zfont0.c +++ b/gs/src/zfont0.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Composite font creation operator */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zfont1.c b/gs/src/zfont1.c index 28fd6b231..70e4733bf 100644 --- a/gs/src/zfont1.c +++ b/gs/src/zfont1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Type 1 and Type 4 font creation operator */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zfont2.c b/gs/src/zfont2.c index ea24f4a3e..fd9147934 100644 --- a/gs/src/zfont2.c +++ b/gs/src/zfont2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Font creation utilities */ #include "memory_.h" #include "string_.h" diff --git a/gs/src/zfont32.c b/gs/src/zfont32.c index ab0e14b7e..a497567b9 100644 --- a/gs/src/zfont32.c +++ b/gs/src/zfont32.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Type 32 font operators */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zfont42.c b/gs/src/zfont42.c index 2a04aa52d..281a4a0c2 100644 --- a/gs/src/zfont42.c +++ b/gs/src/zfont42.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Type 42 font creation operator */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zfproc.c b/gs/src/zfproc.c index 2581b7cf6..4293b6abd 100644 --- a/gs/src/zfproc.c +++ b/gs/src/zfproc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Procedure-based filter stream support */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zfreuse.c b/gs/src/zfreuse.c index a2f87a9fa..6f254326b 100644 --- a/gs/src/zfreuse.c +++ b/gs/src/zfreuse.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* ReusableStreamDecode filter support */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zfunc.c b/gs/src/zfunc.c index 1c7fb2426..d3a20a4ad 100644 --- a/gs/src/zfunc.c +++ b/gs/src/zfunc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Generic PostScript language interface to Functions */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zfunc0.c b/gs/src/zfunc0.c index dddee155f..533276a19 100644 --- a/gs/src/zfunc0.c +++ b/gs/src/zfunc0.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* PostScript language interface to FunctionType 0 (Sampled) Functions */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zfunc3.c b/gs/src/zfunc3.c index d8d138e20..c88ef8b96 100644 --- a/gs/src/zfunc3.c +++ b/gs/src/zfunc3.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* PostScript language interface to LL3 Functions */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zfzlib.c b/gs/src/zfzlib.c index 5ea0fb45e..589337de2 100644 --- a/gs/src/zfzlib.c +++ b/gs/src/zfzlib.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* zlib and Flate filter creation */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zgeneric.c b/gs/src/zgeneric.c index 4d929dc78..e1b0da620 100644 --- a/gs/src/zgeneric.c +++ b/gs/src/zgeneric.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Array/string/dictionary generic operators for PostScript */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zgstate.c b/gs/src/zgstate.c index 02c4da4df..e21939b8c 100644 --- a/gs/src/zgstate.c +++ b/gs/src/zgstate.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Graphics state operators */ #include "math_.h" #include "ghost.h" diff --git a/gs/src/zhsb.c b/gs/src/zhsb.c index 3337af3d2..0342a14c6 100644 --- a/gs/src/zhsb.c +++ b/gs/src/zhsb.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* HSB color operators */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zht.c b/gs/src/zht.c index 5252ea7a3..c829bb76f 100644 --- a/gs/src/zht.c +++ b/gs/src/zht.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Halftone definition operators */ #include "ghost.h" #include "memory_.h" diff --git a/gs/src/zht1.c b/gs/src/zht1.c index 3bc5ceb13..4a246263d 100644 --- a/gs/src/zht1.c +++ b/gs/src/zht1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* setcolorscreen operator */ #include "ghost.h" #include "memory_.h" diff --git a/gs/src/zht2.c b/gs/src/zht2.c index e66bc25e9..711546aca 100644 --- a/gs/src/zht2.c +++ b/gs/src/zht2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Level 2 sethalftone operator */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zimage.c b/gs/src/zimage.c index ae3229c7c..ae0014517 100644 --- a/gs/src/zimage.c +++ b/gs/src/zimage.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Image operators */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zimage2.c b/gs/src/zimage2.c index 3427218d4..7e49997d9 100644 --- a/gs/src/zimage2.c +++ b/gs/src/zimage2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* image operator extensions for Level 2 PostScript */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/zimage3.c b/gs/src/zimage3.c index a04104a3b..0de667566 100644 --- a/gs/src/zimage3.c +++ b/gs/src/zimage3.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* LanguageLevel 3 ImageTypes (3 & 4 - masked images) */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/ziodev.c b/gs/src/ziodev.c index 47e049083..d59abe129 100644 --- a/gs/src/ziodev.c +++ b/gs/src/ziodev.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Standard IODevice implementation */ #include "memory_.h" #include "stdio_.h" diff --git a/gs/src/ziodev2.c b/gs/src/ziodev2.c index b06b58569..11f3bdb28 100644 --- a/gs/src/ziodev2.c +++ b/gs/src/ziodev2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* (Level 2) IODevice operators */ #include "string_.h" #include "ghost.h" diff --git a/gs/src/zlib.mak b/gs/src/zlib.mak index 1ba3177c2..ab289eeb2 100644 --- a/gs/src/zlib.mak +++ b/gs/src/zlib.mak @@ -29,9 +29,16 @@ # You can get the source code for this library from: # http://www.cdrom.com/infozip/zlib/ # ftp://ftp.cdrom.com/pub/infozip/zlib/ -# zlib-1.1.1.tar.gz or zlib111.zip (zlib 1.1.1) +# zlib-#.#.#.tar.gz or zlib###.zip # Please see Ghostscript's `make.txt' file for instructions about how to # unpack these archives. +# +# When each version of Ghostscript is released, we copy the associated +# version of the zlib library to +# ftp://ftp.cs.wisc.edu/ghost/3rdparty/ +# for more convenient access. +# +# This makefile is known to work with zlib versions through 1.1.3. ZSRC=$(ZSRCDIR)$(D) ZGEN=$(ZGENDIR)$(D) diff --git a/gs/src/zmath.c b/gs/src/zmath.c index 4c8472c5c..83083f3b8 100644 --- a/gs/src/zmath.c +++ b/gs/src/zmath.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Mathematical operators */ #include "math_.h" #include "ghost.h" diff --git a/gs/src/zmatrix.c b/gs/src/zmatrix.c index 6466373d8..2b1f1d25c 100644 --- a/gs/src/zmatrix.c +++ b/gs/src/zmatrix.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Matrix operators */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zmedia2.c b/gs/src/zmedia2.c index 2af80e888..2055e6893 100644 --- a/gs/src/zmedia2.c +++ b/gs/src/zmedia2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Media matching for setpagedevice */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/zmisc.c b/gs/src/zmisc.c index 4ca6fe3df..54e30a16a 100644 --- a/gs/src/zmisc.c +++ b/gs/src/zmisc.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Miscellaneous operators */ #include "errno_.h" #include "memory_.h" diff --git a/gs/src/zmisc1.c b/gs/src/zmisc1.c index 57f8eefb7..0b7f5cc85 100644 --- a/gs/src/zmisc1.c +++ b/gs/src/zmisc1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Miscellaneous Type 1 font operators */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zmisc2.c b/gs/src/zmisc2.c index a3e44290c..565fd6256 100644 --- a/gs/src/zmisc2.c +++ b/gs/src/zmisc2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Miscellaneous Level 2 operators */ #include "memory_.h" #include "string_.h" diff --git a/gs/src/zmisc3.c b/gs/src/zmisc3.c index 1b8fe015c..f07f0c9d4 100644 --- a/gs/src/zmisc3.c +++ b/gs/src/zmisc3.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Miscellaneous LanguageLevel 3 operators */ #include "ghost.h" #include "gsclipsr.h" diff --git a/gs/src/zpacked.c b/gs/src/zpacked.c index 46aba4c66..b50748ba9 100644 --- a/gs/src/zpacked.c +++ b/gs/src/zpacked.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Packed array operators */ #include "ghost.h" #include "ialloc.h" diff --git a/gs/src/zpaint.c b/gs/src/zpaint.c index d06ac5314..4eecad4c3 100644 --- a/gs/src/zpaint.c +++ b/gs/src/zpaint.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Painting operators */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zpath.c b/gs/src/zpath.c index 8e177a54d..a090d4bd2 100644 --- a/gs/src/zpath.c +++ b/gs/src/zpath.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Basic path operators */ #include "math_.h" #include "ghost.h" diff --git a/gs/src/zpath1.c b/gs/src/zpath1.c index b006c6007..6e1ebe77f 100644 --- a/gs/src/zpath1.c +++ b/gs/src/zpath1.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* PostScript Level 1 additional path operators */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zpcolor.c b/gs/src/zpcolor.c index 1d717a384..2d92e29be 100644 --- a/gs/src/zpcolor.c +++ b/gs/src/zpcolor.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Pattern color */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zrelbit.c b/gs/src/zrelbit.c index a8646bae5..53c0d0abb 100644 --- a/gs/src/zrelbit.c +++ b/gs/src/zrelbit.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Relational, boolean, and bit operators */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zrop.c b/gs/src/zrop.c index 69d37267f..abffe84f3 100644 --- a/gs/src/zrop.c +++ b/gs/src/zrop.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* RasterOp control operators */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zshade.c b/gs/src/zshade.c index 6f2f98e8d..b02611fce 100644 --- a/gs/src/zshade.c +++ b/gs/src/zshade.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* PostScript language interface to shading */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zstack.c b/gs/src/zstack.c index ef4801e55..644a9e610 100644 --- a/gs/src/zstack.c +++ b/gs/src/zstack.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Operand stack operators */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zstring.c b/gs/src/zstring.c index c05a64401..e781ef6fd 100644 --- a/gs/src/zstring.c +++ b/gs/src/zstring.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* String operators */ #include "memory_.h" #include "ghost.h" diff --git a/gs/src/zsysvm.c b/gs/src/zsysvm.c index abcbe59a6..e906e413d 100644 --- a/gs/src/zsysvm.c +++ b/gs/src/zsysvm.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* System VM and VM-specific operators */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/ztoken.c b/gs/src/ztoken.c index d7aebabe3..b1f657df6 100644 --- a/gs/src/ztoken.c +++ b/gs/src/ztoken.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Token reading operators */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/ztrap.c b/gs/src/ztrap.c index 997745ade..b3d406c70 100644 --- a/gs/src/ztrap.c +++ b/gs/src/ztrap.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Operators for setting trapping parameters and zones */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/ztype.c b/gs/src/ztype.c index 3a4a056e9..ee2ffc63f 100644 --- a/gs/src/ztype.c +++ b/gs/src/ztype.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Type, attribute, and conversion operators */ #include "math_.h" #include "memory_.h" diff --git a/gs/src/zupath.c b/gs/src/zupath.c index e4e93556c..8ba593cbf 100644 --- a/gs/src/zupath.c +++ b/gs/src/zupath.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Operators related to user paths */ #include "ghost.h" #include "oper.h" diff --git a/gs/src/zusparam.c b/gs/src/zusparam.c index f3553c68f..2caad1ed0 100644 --- a/gs/src/zusparam.c +++ b/gs/src/zusparam.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* User and system parameter operators */ #include "memory_.h" #include "string_.h" diff --git a/gs/src/zvmem.c b/gs/src/zvmem.c index a6c98d7a5..de0094c21 100644 --- a/gs/src/zvmem.c +++ b/gs/src/zvmem.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* "Virtual memory" operators */ #include "ghost.h" #include "gsstruct.h" diff --git a/gs/src/zvmem2.c b/gs/src/zvmem2.c index 0b2f663ca..ae2dd6fb0 100644 --- a/gs/src/zvmem2.c +++ b/gs/src/zvmem2.c @@ -16,7 +16,7 @@ all copies. */ -/*$Id$ */ + /* Level 2 "Virtual memory" operators */ #include "ghost.h" #include "oper.h" |