diff options
-rw-r--r-- | common/ugcc_top.mak | 4 | ||||
-rw-r--r-- | gs/base/gdevtsep.c | 7 | ||||
-rw-r--r-- | gs/base/msvccmd.mak | 6 | ||||
-rw-r--r-- | gs/base/msvctail.mak | 14 | ||||
-rw-r--r-- | gs/base/unix-aux.mak | 14 | ||||
-rw-r--r-- | gs/doc/Devices.htm | 6 |
6 files changed, 31 insertions, 20 deletions
diff --git a/common/ugcc_top.mak b/common/ugcc_top.mak index aa9f2c9ed..d90765093 100644 --- a/common/ugcc_top.mak +++ b/common/ugcc_top.mak @@ -32,8 +32,8 @@ CCLD=$(CC) CCAUXLD=$(CCAUX) CCFLAGS=$(GENOPT) $(CFLAGS) $(XCFLAGS) -CC_=$(CC) $(CCFLAGS) -c -CCAUX_=$(CCAUX) $(CFLAGS) -c +CC_=$(CC) $(CCFLAGS) +CCAUX_=$(CCAUX) $(CFLAGS) GLD=$(GLGENDIR)/ CC_NO_WARN=$(CC_) -Wno-cast-qual -Wno-traditional diff --git a/gs/base/gdevtsep.c b/gs/base/gdevtsep.c index 2bf78404e..85d9d3819 100644 --- a/gs/base/gdevtsep.c +++ b/gs/base/gdevtsep.c @@ -408,7 +408,7 @@ static dev_proc_fill_path(sep1_fill_path); TIFFTAG_COMPRESSION */\ long MaxStripSize;\ gs_devn_params devn_params; /* DeviceN generated parameters */\ - equivalent_cmyk_color_params equiv_cmyk_colors + equivalent_cmyk_color_params equiv_cmyk_colors\ /* * A structure definition for a DeviceN type device @@ -1574,6 +1574,11 @@ tiffsep_print_page(gx_device_printer * pdev, FILE * file) /* Set up the separation output files */ num_comp = number_output_separations( tfdev->color_info.num_components, num_std_colorants, num_order, num_spot); + + if (!num_order && num_comp < num_std_colorants + num_spot) { + dlprintf("Warning: skipping one or more colour separations, see: Devices.htm#TIFF\n"); + } + for (comp_num = 0; comp_num < num_comp; comp_num++ ) { int sep_num = map_comp_to_sep[comp_num]; diff --git a/gs/base/msvccmd.mak b/gs/base/msvccmd.mak index 52d65c2f0..058da1172 100644 --- a/gs/base/msvccmd.mak +++ b/gs/base/msvccmd.mak @@ -56,7 +56,7 @@ SH= # Define switches for the compilers. -C_= +C_=/c O_=-Fo RO_=$(O_) @@ -242,8 +242,8 @@ CC_NO_WARN=$(CC_) # Compiler for auxiliary programs CCAUX=$(COMPAUX) $(VC8WARN) $(CFLAGS) -CCAUX_=$(COMPAUX) $(VC8WARN) $(CFLAGS) /c -CCAUX_NO_WARN=$(COMPAUX) $(CFLAGS) /c +CCAUX_=$(COMPAUX) $(VC8WARN) $(CFLAGS) +CCAUX_NO_WARN=$(COMPAUX) $(CFLAGS) # Compiler for Windows programs. CCWINFLAGS=$(COMPILE_FULL_OPTIMIZED) diff --git a/gs/base/msvctail.mak b/gs/base/msvctail.mak index c33e93e3b..2bf6c837f 100644 --- a/gs/base/msvctail.mak +++ b/gs/base/msvctail.mak @@ -33,33 +33,33 @@ $(GLGENDIR)\ccf32.tr: $(TOP_MAKEFILES) echo $(GENOPT) -DCHECK_INTERRUPTS -D_Windows -D__WIN32__ > $(GLGENDIR)\ccf32.tr $(ECHOGS_XE): $(GLSRC)echogs.c - $(CCAUX) $(GLSRC)echogs.c /Fo$(GLOBJ)echogs.obj /Fe$(ECHOGS_XE) $(CCAUX_TAIL) + $(CCAUX_) $(GLSRC)echogs.c /Fo$(GLOBJ)echogs.obj /Fe$(ECHOGS_XE) $(CCAUX_TAIL) # Don't create genarch if it's not needed !ifdef GENARCH_XE !ifdef WIN64 # The genarch.exe that is generated is 64-bit, so the OS must be able to run it $(GENARCH_XE): $(GLSRC)genarch.c $(GENARCH_DEPS) $(GLGENDIR)\ccf32.tr - $(CCAUX) @$(GLGENDIR)\ccf32.tr /Fo$(AUXDIR)genarch.obj $(GLSRC)genarch.c + $(CCAUX_) @$(GLGENDIR)\ccf32.tr /Fo$(AUXDIR)genarch.obj $(GLSRC)genarch.c $(LINK) $(LCT) $(LINKLIBPATH) $(AUX)genarch.obj /OUT:$(GENARCH_XE) !else $(GENARCH_XE): $(GLSRC)genarch.c $(GENARCH_DEPS) $(GLGENDIR)\ccf32.tr - $(CCAUX) @$(GLGENDIR)\ccf32.tr /Fo$(AUX)genarch.obj /Fe$(GENARCH_XE) $(GLSRC)genarch.c $(CCAUX_TAIL) + $(CCAUX_) @$(GLGENDIR)\ccf32.tr /Fo$(AUX)genarch.obj /Fe$(GENARCH_XE) $(GLSRC)genarch.c $(CCAUX_TAIL) !endif !endif $(GENCONF_XE): $(GLSRC)genconf.c $(GENCONF_DEPS) - $(CCAUX) $(GLSRC)genconf.c /Fo$(AUX)genconf.obj /Fe$(GENCONF_XE) $(CCAUX_TAIL) + $(CCAUX_) $(GLSRC)genconf.c /Fo$(AUX)genconf.obj /Fe$(GENCONF_XE) $(CCAUX_TAIL) $(GENDEV_XE): $(GLSRC)gendev.c $(GENDEV_DEPS) - $(CCAUX) $(GLSRC)gendev.c /Fo$(AUX)gendev.obj /Fe$(GENDEV_XE) $(CCAUX_TAIL) + $(CCAUX_) $(GLSRC)gendev.c /Fo$(AUX)gendev.obj /Fe$(GENDEV_XE) $(CCAUX_TAIL) $(GENHT_XE): $(GLSRC)genht.c $(GENHT_DEPS) - $(CCAUX) $(GENHT_CFLAGS) $(GLSRC)genht.c /Fo$(AUX)genht.obj /Fe$(GENHT_XE) $(CCAUX_TAIL) + $(CCAUX_) $(GENHT_CFLAGS) $(GLSRC)genht.c /Fo$(AUX)genht.obj /Fe$(GENHT_XE) $(CCAUX_TAIL) MKROMFS_OBJS=$(MKROMFS_ZLIB_OBJS) $(winplat_) $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) $(GLOBJ)gp_wutf8.$(OBJ) $(MKROMFS_XE): $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS) - $(CCAUX) -I$(GLOBJ) -I$(ZSRCDIR) @$(GLGENDIR)\ccf32.tr $(GLSRC)mkromfs.c /Fo$(AUX)mkromfs.obj /Fe$(MKROMFS_XE) $(MKROMFS_OBJS) $(CCAUX_TAIL) /DEBUG + $(CCAUX_) -I$(GLOBJ) -I$(ZSRCDIR) @$(GLGENDIR)\ccf32.tr $(GLSRC)mkromfs.c /Fo$(AUX)mkromfs.obj /Fe$(MKROMFS_XE) $(MKROMFS_OBJS) $(CCAUX_TAIL) /DEBUG # -------------------------------- Library -------------------------------- # diff --git a/gs/base/unix-aux.mak b/gs/base/unix-aux.mak index 00d949e3b..418ac50a9 100644 --- a/gs/base/unix-aux.mak +++ b/gs/base/unix-aux.mak @@ -68,21 +68,21 @@ $(GLOBJ)gp_sysv.$(OBJ): $(GLSRC)gp_sysv.c $(stdio__h) $(time__h) $(AK)\ # -------------------------- Auxiliary programs --------------------------- # $(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS) - $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c + $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c # On the RS/6000 (at least), compiling genarch.c with gcc with -O # produces a buggy executable. $(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(MAKEDIRS) - $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c + $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c $(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(MAKEDIRS) - $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c + $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c $(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(MAKEDIRS) - $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c + $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c $(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(MAKEDIRS) - $(CCAUX) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c + $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c # To get GS to use the system zlib, you remove/hide the gs/zlib directory # which means that the mkromfs build can't find the zlib source it needs. @@ -93,7 +93,7 @@ MKROMFS_OBJS_0=$(MKROMFS_ZLIB_OBJS) $(AUX)gscdefs.$(OBJ) $(AUX)gsmisc.$(OBJ) \ $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) $(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) - $(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) -lm $(EXTRALIBS) + $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) -lm $(EXTRALIBS) # .... and one using the zlib library linked via the command line MKROMFS_OBJS_1=$(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \ @@ -102,7 +102,7 @@ MKROMFS_OBJS_1=$(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \ $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ) $(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) - $(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) -lm $(EXTRALIBS) + $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) -lm $(EXTRALIBS) $(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS) $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) diff --git a/gs/doc/Devices.htm b/gs/doc/Devices.htm index 996507649..a65fd6df8 100644 --- a/gs/doc/Devices.htm +++ b/gs/doc/Devices.htm @@ -425,6 +425,12 @@ SeparationOrder parameter, the composite CMYK output contains the equivalent CMYK data only for the selected colorants. <p> +NOTE: the composite CMYK output, because it uses the tint transformed +colour equivalents for any spot colours (see Postscript Language +Reference "Separation Color Spaces" and "DeviceN Color Spaces"), may +not produce an accurate preview, if the job uses overprinting. + +<p> The tiffsep device also prints the names of any spot colors detected within a document to stderr. (stderr is also used for the output from the bbox device.) For each spot color the name of |