diff options
| author | Nancy Durgin <nancy.durgin@artifex.com> | 2019-01-16 12:55:22 -0800 |
|---|---|---|
| committer | Nancy Durgin <nancy.durgin@artifex.com> | 2019-01-24 08:21:44 -0800 |
| commit | 2905c901244a3c105560a48ae3047196961920d7 (patch) | |
| tree | de2ef95ba43e1ebdc9a717de37c27092f143507c /psi/int.mak | |
| parent | e7ff64cf9b756278f19c87d295ee0fd95c955c05 (diff) | |
| download | ghostpdl-2905c901244a3c105560a48ae3047196961920d7.tar.gz | |
Undef internal operators from gs_cff.ps
- rearranged some code in gs_cff.ps to have things defined before used
- /.init_wOFF_otto_font_file is only used locally, undef right after use
- /.init_otto_font_file is used by pdf_fonts.ps, undef in gs_init.ps
/.init_otto_font_file was being defined after it was used, because
gs_cff.ps was run after pdf_fonts.ps. Need to define before using, in
order to be able to undef, so had to change psi/int.mak to load
gs_cff.ps before pdf_fonts.ps. Also moved around the cff.dev dependencies
accordingly.
NOTE: To see what order the files will be loaded, you can look at
obj/iconfig.h which is generated by the makefile magic. You can also
look at the INITFILES array in gs_init.ps, which the stuff in
iconfig.h eventually generates.
Diffstat (limited to 'psi/int.mak')
| -rw-r--r-- | psi/int.mak | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/psi/int.mak b/psi/int.mak index 5dfb66ca7..e93d05f6e 100644 --- a/psi/int.mak +++ b/psi/int.mak @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2019 Artifex Software, Inc. +# Copyright (C) 2001-2018 Artifex Software, Inc. # All Rights Reserved. # # This software is provided AS-IS with no warranty, either express or @@ -1772,13 +1772,13 @@ $(PSOBJ)zform.$(OBJ) : $(PSSRC)zform.c $(OP) $(ghost_h) $(oper_h)\ # level2dict is defined. $(PSD)pdf.dev : $(ECHOGS_XE)\ $(GLD)dps2lib.dev $(PSD)dps2read.dev\ - $(PSD)pdffonts.dev $(PSD)psl3.dev $(PSD)pdfread.dev $(PSD)cff.dev\ + $(PSD)pdffonts.dev $(PSD)psl3.dev $(PSD)pdfread.dev\ $(PSD)fmd5.dev $(PSD)fsha2.dev $(PSD)farc4.dev $(PSD)faes.dev\ $(PSD)ttfont.dev $(PSD)type2.dev $(PSD)pdfops.dev\ $(PSD)pdf_r6.dev $(INT_MAK) $(MAKEDIRS) $(SETMOD) $(PSD)pdf -include $(PSD)psbase $(GLD)dps2lib $(ADDMOD) $(PSD)pdf -include $(PSD)dps2read $(PSD)pdffonts $(PSD)psl3 - $(ADDMOD) $(PSD)pdf -include $(GLD)psl2lib $(PSD)pdfread $(PSD)cff + $(ADDMOD) $(PSD)pdf -include $(GLD)psl2lib $(PSD)pdfread $(ADDMOD) $(PSD)pdf -include $(PSD)fmd5 $(PSD)fsha2 $(ADDMOD) $(PSD)pdf -include $(PSD)farc4 $(PSD)faes.dev $(ADDMOD) $(PSD)pdf -include $(PSD)ttfont $(PSD)type2 @@ -1793,13 +1793,15 @@ $(PSD)pdffonts.dev : $(ECHOGS_XE) $(INT_MAK) $(MAKEDIRS) $(SETMOD) $(PSD)pdffonts -ps gs_mex_e gs_mro_e gs_pdf_e gs_wan_e $(PSD)pdfread.dev : $(ECHOGS_XE) \ - $(PSD)frsd.dev $(PSD)func4.dev $(PSD)fzlib.dev $(PSD)transpar.dev\ + $(PSD)frsd.dev $(PSD)func4.dev $(PSD)fzlib.dev $(PSD)transpar.dev $(PSD)cff.dev\ $(INT_MAK) $(MAKEDIRS) $(SETMOD) $(PSD)pdfread -include $(PSD)frsd $(PSD)func4 $(PSD)fzlib $(ADDMOD) $(PSD)pdfread -include $(PSD)transpar $(ADDMOD) $(PSD)pdfread -ps pdf_ops $(ADDMOD) $(PSD)pdfread -ps pdf_rbld - $(ADDMOD) $(PSD)pdfread -ps pdf_base pdf_draw pdf_font pdf_main pdf_sec + $(ADDMOD) $(PSD)pdfread -ps pdf_base pdf_draw + $(ADDMOD) $(PSD)pdfread -include $(PSD)cff + $(ADDMOD) $(PSD)pdfread -ps pdf_font pdf_main pdf_sec # ---------------- PS Support for Font API ---------------- # $(PSD)fapi_ps.dev : $(LIB_MAK) $(ECHOGS_XE) $(PSOBJ)zfapi.$(OBJ)\ |