summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Liddell <chris.liddell@artifex.com>2011-07-06 13:30:23 +0100
committerChris Liddell <chris.liddell@artifex.com>2011-07-06 13:39:45 +0100
commite5a37634a8e15a945e7f5ea4aca68ab8e1e34d3a (patch)
tree1e7a683eb1618673609d4b46c7e055c6f91f3674
parent836ac602259ed7e6dfa2845ce78c5fcb516c72e1 (diff)
Bug 692318: Ensure that compiler flags are used for the "aux" files.
For a normal host build, the build tools (genarch, genconf etc) should be built with the same compiler flags as Ghostscript/Ghost*. In this case the integer type used for encoded color values was not getting used when compiling genarch. Also, add a warning when tiffsep does have to skip one or more plates, with a pointer to the relevant documentation. Lastly, update the doc to reflect that the contone preview output may not be as expected if the job uses overprint. No cluster differences expected.
-rw-r--r--common/ugcc_top.mak4
-rw-r--r--gs/base/gdevtsep.c7
-rw-r--r--gs/base/msvccmd.mak6
-rw-r--r--gs/base/msvctail.mak14
-rw-r--r--gs/base/unix-aux.mak14
-rw-r--r--gs/doc/Devices.htm6
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)
32CCAUXLD=$(CCAUX) 32CCAUXLD=$(CCAUX)
33 33
34CCFLAGS=$(GENOPT) $(CFLAGS) $(XCFLAGS) 34CCFLAGS=$(GENOPT) $(CFLAGS) $(XCFLAGS)
35CC_=$(CC) $(CCFLAGS) -c 35CC_=$(CC) $(CCFLAGS)
36CCAUX_=$(CCAUX) $(CFLAGS) -c 36CCAUX_=$(CCAUX) $(CFLAGS)
37 37
38GLD=$(GLGENDIR)/ 38GLD=$(GLGENDIR)/
39CC_NO_WARN=$(CC_) -Wno-cast-qual -Wno-traditional 39CC_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);
408 TIFFTAG_COMPRESSION */\ 408 TIFFTAG_COMPRESSION */\
409 long MaxStripSize;\ 409 long MaxStripSize;\
410 gs_devn_params devn_params; /* DeviceN generated parameters */\ 410 gs_devn_params devn_params; /* DeviceN generated parameters */\
411 equivalent_cmyk_color_params equiv_cmyk_colors 411 equivalent_cmyk_color_params equiv_cmyk_colors\
412 412
413/* 413/*
414 * A structure definition for a DeviceN type device 414 * A structure definition for a DeviceN type device
@@ -1574,6 +1574,11 @@ tiffsep_print_page(gx_device_printer * pdev, FILE * file)
1574 /* Set up the separation output files */ 1574 /* Set up the separation output files */
1575 num_comp = number_output_separations( tfdev->color_info.num_components, 1575 num_comp = number_output_separations( tfdev->color_info.num_components,
1576 num_std_colorants, num_order, num_spot); 1576 num_std_colorants, num_order, num_spot);
1577
1578 if (!num_order && num_comp < num_std_colorants + num_spot) {
1579 dlprintf("Warning: skipping one or more colour separations, see: Devices.htm#TIFF\n");
1580 }
1581
1577 for (comp_num = 0; comp_num < num_comp; comp_num++ ) { 1582 for (comp_num = 0; comp_num < num_comp; comp_num++ ) {
1578 int sep_num = map_comp_to_sep[comp_num]; 1583 int sep_num = map_comp_to_sep[comp_num];
1579 1584
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=
56 56
57# Define switches for the compilers. 57# Define switches for the compilers.
58 58
59C_= 59C_=/c
60O_=-Fo 60O_=-Fo
61RO_=$(O_) 61RO_=$(O_)
62 62
@@ -242,8 +242,8 @@ CC_NO_WARN=$(CC_)
242# Compiler for auxiliary programs 242# Compiler for auxiliary programs
243 243
244CCAUX=$(COMPAUX) $(VC8WARN) $(CFLAGS) 244CCAUX=$(COMPAUX) $(VC8WARN) $(CFLAGS)
245CCAUX_=$(COMPAUX) $(VC8WARN) $(CFLAGS) /c 245CCAUX_=$(COMPAUX) $(VC8WARN) $(CFLAGS)
246CCAUX_NO_WARN=$(COMPAUX) $(CFLAGS) /c 246CCAUX_NO_WARN=$(COMPAUX) $(CFLAGS)
247 247
248# Compiler for Windows programs. 248# Compiler for Windows programs.
249CCWINFLAGS=$(COMPILE_FULL_OPTIMIZED) 249CCWINFLAGS=$(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)
33 echo $(GENOPT) -DCHECK_INTERRUPTS -D_Windows -D__WIN32__ > $(GLGENDIR)\ccf32.tr 33 echo $(GENOPT) -DCHECK_INTERRUPTS -D_Windows -D__WIN32__ > $(GLGENDIR)\ccf32.tr
34 34
35$(ECHOGS_XE): $(GLSRC)echogs.c 35$(ECHOGS_XE): $(GLSRC)echogs.c
36 $(CCAUX) $(GLSRC)echogs.c /Fo$(GLOBJ)echogs.obj /Fe$(ECHOGS_XE) $(CCAUX_TAIL) 36 $(CCAUX_) $(GLSRC)echogs.c /Fo$(GLOBJ)echogs.obj /Fe$(ECHOGS_XE) $(CCAUX_TAIL)
37 37
38# Don't create genarch if it's not needed 38# Don't create genarch if it's not needed
39!ifdef GENARCH_XE 39!ifdef GENARCH_XE
40!ifdef WIN64 40!ifdef WIN64
41# The genarch.exe that is generated is 64-bit, so the OS must be able to run it 41# The genarch.exe that is generated is 64-bit, so the OS must be able to run it
42$(GENARCH_XE): $(GLSRC)genarch.c $(GENARCH_DEPS) $(GLGENDIR)\ccf32.tr 42$(GENARCH_XE): $(GLSRC)genarch.c $(GENARCH_DEPS) $(GLGENDIR)\ccf32.tr
43 $(CCAUX) @$(GLGENDIR)\ccf32.tr /Fo$(AUXDIR)genarch.obj $(GLSRC)genarch.c 43 $(CCAUX_) @$(GLGENDIR)\ccf32.tr /Fo$(AUXDIR)genarch.obj $(GLSRC)genarch.c
44 $(LINK) $(LCT) $(LINKLIBPATH) $(AUX)genarch.obj /OUT:$(GENARCH_XE) 44 $(LINK) $(LCT) $(LINKLIBPATH) $(AUX)genarch.obj /OUT:$(GENARCH_XE)
45!else 45!else
46$(GENARCH_XE): $(GLSRC)genarch.c $(GENARCH_DEPS) $(GLGENDIR)\ccf32.tr 46$(GENARCH_XE): $(GLSRC)genarch.c $(GENARCH_DEPS) $(GLGENDIR)\ccf32.tr
47 $(CCAUX) @$(GLGENDIR)\ccf32.tr /Fo$(AUX)genarch.obj /Fe$(GENARCH_XE) $(GLSRC)genarch.c $(CCAUX_TAIL) 47 $(CCAUX_) @$(GLGENDIR)\ccf32.tr /Fo$(AUX)genarch.obj /Fe$(GENARCH_XE) $(GLSRC)genarch.c $(CCAUX_TAIL)
48!endif 48!endif
49!endif 49!endif
50 50
51$(GENCONF_XE): $(GLSRC)genconf.c $(GENCONF_DEPS) 51$(GENCONF_XE): $(GLSRC)genconf.c $(GENCONF_DEPS)
52 $(CCAUX) $(GLSRC)genconf.c /Fo$(AUX)genconf.obj /Fe$(GENCONF_XE) $(CCAUX_TAIL) 52 $(CCAUX_) $(GLSRC)genconf.c /Fo$(AUX)genconf.obj /Fe$(GENCONF_XE) $(CCAUX_TAIL)
53 53
54$(GENDEV_XE): $(GLSRC)gendev.c $(GENDEV_DEPS) 54$(GENDEV_XE): $(GLSRC)gendev.c $(GENDEV_DEPS)
55 $(CCAUX) $(GLSRC)gendev.c /Fo$(AUX)gendev.obj /Fe$(GENDEV_XE) $(CCAUX_TAIL) 55 $(CCAUX_) $(GLSRC)gendev.c /Fo$(AUX)gendev.obj /Fe$(GENDEV_XE) $(CCAUX_TAIL)
56 56
57$(GENHT_XE): $(GLSRC)genht.c $(GENHT_DEPS) 57$(GENHT_XE): $(GLSRC)genht.c $(GENHT_DEPS)
58 $(CCAUX) $(GENHT_CFLAGS) $(GLSRC)genht.c /Fo$(AUX)genht.obj /Fe$(GENHT_XE) $(CCAUX_TAIL) 58 $(CCAUX_) $(GENHT_CFLAGS) $(GLSRC)genht.c /Fo$(AUX)genht.obj /Fe$(GENHT_XE) $(CCAUX_TAIL)
59 59
60MKROMFS_OBJS=$(MKROMFS_ZLIB_OBJS) $(winplat_) $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) $(GLOBJ)gp_wutf8.$(OBJ) 60MKROMFS_OBJS=$(MKROMFS_ZLIB_OBJS) $(winplat_) $(GLOBJ)gpmisc.$(OBJ) $(GLOBJ)gp_getnv.$(OBJ) $(GLOBJ)gp_wutf8.$(OBJ)
61$(MKROMFS_XE): $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS) 61$(MKROMFS_XE): $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS)
62 $(CCAUX) -I$(GLOBJ) -I$(ZSRCDIR) @$(GLGENDIR)\ccf32.tr $(GLSRC)mkromfs.c /Fo$(AUX)mkromfs.obj /Fe$(MKROMFS_XE) $(MKROMFS_OBJS) $(CCAUX_TAIL) /DEBUG 62 $(CCAUX_) -I$(GLOBJ) -I$(ZSRCDIR) @$(GLGENDIR)\ccf32.tr $(GLSRC)mkromfs.c /Fo$(AUX)mkromfs.obj /Fe$(MKROMFS_XE) $(MKROMFS_OBJS) $(CCAUX_TAIL) /DEBUG
63 63
64# -------------------------------- Library -------------------------------- # 64# -------------------------------- Library -------------------------------- #
65 65
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)\
68# -------------------------- Auxiliary programs --------------------------- # 68# -------------------------- Auxiliary programs --------------------------- #
69 69
70$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS) 70$(ECHOGS_XE): $(GLSRC)echogs.c $(AK) $(stdpre_h) $(MAKEDIRS)
71 $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c 71 $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(ECHOGS_XE) $(GLSRC)echogs.c
72 72
73# On the RS/6000 (at least), compiling genarch.c with gcc with -O 73# On the RS/6000 (at least), compiling genarch.c with gcc with -O
74# produces a buggy executable. 74# produces a buggy executable.
75$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(MAKEDIRS) 75$(GENARCH_XE): $(GLSRC)genarch.c $(AK) $(GENARCH_DEPS) $(MAKEDIRS)
76 $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c 76 $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENARCH_XE) $(GLSRC)genarch.c
77 77
78$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(MAKEDIRS) 78$(GENCONF_XE): $(GLSRC)genconf.c $(AK) $(GENCONF_DEPS) $(MAKEDIRS)
79 $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c 79 $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENCONF_XE) $(GLSRC)genconf.c
80 80
81$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(MAKEDIRS) 81$(GENDEV_XE): $(GLSRC)gendev.c $(AK) $(GENDEV_DEPS) $(MAKEDIRS)
82 $(CCAUX) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c 82 $(CCAUX_) $(I_)$(GLSRCDIR)$(_I) $(O_)$(GENDEV_XE) $(GLSRC)gendev.c
83 83
84$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(MAKEDIRS) 84$(GENHT_XE): $(GLSRC)genht.c $(AK) $(GENHT_DEPS) $(MAKEDIRS)
85 $(CCAUX) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c 85 $(CCAUX_) $(GENHT_CFLAGS) $(O_)$(GENHT_XE) $(GLSRC)genht.c
86 86
87# To get GS to use the system zlib, you remove/hide the gs/zlib directory 87# To get GS to use the system zlib, you remove/hide the gs/zlib directory
88# which means that the mkromfs build can't find the zlib source it needs. 88# 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) \
93 $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ) 93 $(AUX)gp_stdia.$(OBJ) $(AUX)gsutil.$(OBJ) $(AUX)memento.$(OBJ)
94 94
95$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0) 95$(MKROMFS_XE)_0: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_0)
96 $(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) -lm $(EXTRALIBS) 96 $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_0 $(MKROMFS_OBJS_0) -lm $(EXTRALIBS)
97 97
98# .... and one using the zlib library linked via the command line 98# .... and one using the zlib library linked via the command line
99MKROMFS_OBJS_1=$(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \ 99MKROMFS_OBJS_1=$(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \
@@ -102,7 +102,7 @@ MKROMFS_OBJS_1=$(GLOBJ)gscdefs.$(OBJ) $(GLOBJ)gsmisc.$(OBJ) \
102 $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ) 102 $(GLOBJ)gp_stdia.$(OBJ) $(GLOBJ)gsutil.$(OBJ)
103 103
104$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1) 104$(MKROMFS_XE)_1: $(GLSRC)mkromfs.c $(MKROMFS_COMMON_DEPS) $(MKROMFS_OBJS_1)
105 $(CCAUX) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) -lm $(EXTRALIBS) 105 $(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) -lm $(EXTRALIBS)
106 106
107$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS) 107$(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS)
108 $(CP_) $(MKROMFS_XE)_$(SHARE_ZLIB) $(MKROMFS_XE) 108 $(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
425the equivalent CMYK data only for the selected colorants. 425the equivalent CMYK data only for the selected colorants.
426 426
427<p> 427<p>
428NOTE: the composite CMYK output, because it uses the tint transformed
429colour equivalents for any spot colours (see Postscript Language
430Reference "Separation Color Spaces" and "DeviceN Color Spaces"), may
431not produce an accurate preview, if the job uses overprinting.
432
433<p>
428The tiffsep device also prints the names of any spot colors 434The tiffsep device also prints the names of any spot colors
429detected within a document to stderr. (stderr is also used for the 435detected within a document to stderr. (stderr is also used for the
430output from the bbox device.) For each spot color the name of 436output from the bbox device.) For each spot color the name of