[gs-cvs] rev 7823 - trunk/gs/src

[tim at ghostscript.com]

Author: tim
Date: 2007-04-05 19:39:31 -0700 (Thu, 05 Apr 2007)
New Revision: 7823

Modified:
   trunk/gs/src/gsnamecl.h
   trunk/gs/src/int.mak
   trunk/gs/src/lib.mak
Log:
Splitting graphics library from interpreter portion of the sample custom color callback

Modified: trunk/gs/src/gsnamecl.h
===================================================================
--- trunk/gs/src/gsnamecl.h	2007-04-05 21:34:09 UTC (rev 7822)
+++ trunk/gs/src/gsnamecl.h	2007-04-06 02:39:31 UTC (rev 7823)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2006 artofcode LLC.
+/* Copyright (C) 2001-2007 artofcode LLC.
    All Rights Reserved.
   
    This software is provided AS-IS with no warranty, either express or
@@ -25,7 +25,7 @@
  * Enable custom client callback color processing.  Note:  There is a sample
  * implementation in src/gsncdemo.c.
  */
-#define ENABLE_CUSTOM_COLOR_CALLBACK 1	/* 0 --> disabled, 1 --> enabled */
+#define ENABLE_CUSTOM_COLOR_CALLBACK 0	/* 0 --> disabled, 1 --> enabled */
 
 
 #if ENABLE_CUSTOM_COLOR_CALLBACK

Modified: trunk/gs/src/int.mak
===================================================================
--- trunk/gs/src/int.mak	2007-04-05 21:34:09 UTC (rev 7822)
+++ trunk/gs/src/int.mak	2007-04-06 02:39:31 UTC (rev 7823)
@@ -517,6 +517,7 @@
 Z9=$(PSOBJ)zdevice.$(OBJ) $(PSOBJ)zfont.$(OBJ) $(PSOBJ)zfontenum.$(OBJ) $(PSOBJ)zgstate.$(OBJ)
 Z10=$(PSOBJ)zdfilter.$(OBJ) $(PSOBJ)zht.$(OBJ) $(PSOBJ)zimage.$(OBJ) $(PSOBJ)zmatrix.$(OBJ)
 Z11=$(PSOBJ)zpaint.$(OBJ) $(PSOBJ)zpath.$(OBJ)
+Z12=$(PSOBJ)zncdummy.$(OBJ)
 Z1OPS=zarith zarray zcontrol1 zcontrol2 zcontrol3
 Z2OPS=zdict1 zdict2 zfile zfile1 zfileio1 zfileio2
 Z3_4OPS=zfilter zfproc zgeneric ziodev zmath
@@ -530,7 +531,7 @@
 INT_MAIN=$(PSOBJ)imain.$(OBJ) $(PSOBJ)imainarg.$(OBJ) $(GLOBJ)gsargs.$(OBJ) $(PSOBJ)idisp.$(OBJ)
 INT_OBJS=$(INT_MAIN)\
  $(INT1) $(INT2) $(INT3) $(INT4) $(INT5) $(INT6) $(INT7)\
- $(Z1) $(Z2) $(Z3) $(Z4) $(Z5) $(Z6) $(Z7) $(Z8) $(Z9) $(Z10) $(Z11)
+ $(Z1) $(Z2) $(Z3) $(Z4) $(Z5) $(Z6) $(Z7) $(Z8) $(Z9) $(Z10) $(Z11) $(Z12)
 INT_CONFIG=$(GLOBJ)gconfig.$(OBJ) $(GLOBJ)gscdefs.$(OBJ)\
  $(PSOBJ)iconfig.$(OBJ) $(PSOBJ)iccinit$(COMPILE_INITS).$(OBJ)
 INT_ALL=$(INT_OBJS) $(INT_CONFIG)
@@ -567,6 +568,7 @@
 	$(ADDMOD) $(PSD)psbase -obj $(Z9)
 	$(ADDMOD) $(PSD)psbase -obj $(Z10)
 	$(ADDMOD) $(PSD)psbase -obj $(Z11)
+	$(ADDMOD) $(PSD)psbase -obj $(Z12)
 	$(ADDMOD) $(PSD)psbase -oper $(Z1OPS)
 	$(ADDMOD) $(PSD)psbase -oper $(Z2OPS)
 	$(ADDMOD) $(PSD)psbase -oper $(Z3_4OPS)
@@ -1135,12 +1137,13 @@
 	$(SETMOD) $(PSD)usparam $(usparam_)
 	$(ADDMOD) $(PSD)usparam -oper zusparam -replace $(PSD)nousparm
 
+
 # Note that zusparam includes both Level 1 and Level 2 operators.
 $(PSOBJ)zusparam.$(OBJ) : $(PSSRC)zusparam.c $(OP) $(memory__h) $(string__h)\
  $(gscdefs_h) $(gsfont_h) $(gsstruct_h) $(gsutil_h) $(gxht_h)\
  $(ialloc_h) $(icontext_h) $(idict_h) $(idparam_h) $(iparam_h)\
  $(iname_h) $(itoken_h) $(iutil2_h) $(ivmem2_h)\
- $(dstack_h) $(estack_h) $(store_h)
+ $(dstack_h) $(estack_h) $(store_h) $(gsnamecl_h)
 	$(PSCC) $(PSO_)zusparam.$(OBJ) $(C_) $(PSSRC)zusparam.c
 
 # Define full Level 2 support.
@@ -1980,6 +1983,13 @@
 $(PSD)fapif.dev : $(INT_MAK) $(ECHOGS_XE)
 	$(SETMOD) $(PSD)fapif
 
+
+# ---------------- Custom color dummy callback ---------------- #
+
+$(PSOBJ)zncdummy.$(OBJ) : $(PSSRC)zncdummy.c $(OP) $(GX) $(math_h)\
+  $(memory__h) $(gscdefs_h) $(gsnamecl_h) $(malloc__h) $(gsncdummy_h)
+	$(PSCC) $(PSO_)zncdummy.$(OBJ) $(C_) $(PSSRC)zncdummy.c
+
 # ================ Dependencies for auxiliary programs ================ #
 
 GENINIT_DEPS=$(stdpre_h)

Modified: trunk/gs/src/lib.mak
===================================================================
--- trunk/gs/src/lib.mak	2007-04-05 21:34:09 UTC (rev 7822)
+++ trunk/gs/src/lib.mak	2007-04-06 02:39:31 UTC (rev 7823)
@@ -392,6 +392,7 @@
 gxdcolor_h=$(GLSRC)gxdcolor.h\
  $(gscsel_h) $(gsdcolor_h) $(gsropt_h) $(gsstruct_h)
 gsnamecl_h=$(GLSRC)gsnamecl.h
+gsncdummy_h=$(GLSRC)gsncdummy.h
 gscspace_h=$(GLSRC)gscspace.h $(gsmemory_h) $(gsrefct_h)
 gscssub_h=$(GLSRC)gscssub.h $(gscspace_h)
 gxdevcli_h=$(GLSRC)gxdevcli.h $(std_h) $(stdint__h)\
@@ -2439,7 +2440,7 @@
 
 # ---------------- Separation colors ---------------- #
 
-seprlib_=$(GLOBJ)gscsepr.$(OBJ) $(GLOBJ)gsnamecl.$(OBJ) $(GLOBJ)gsncdemo.$(OBJ)
+seprlib_=$(GLOBJ)gscsepr.$(OBJ) $(GLOBJ)gsnamecl.$(OBJ) $(GLOBJ)gsncdummy.$(OBJ)
 $(GLD)seprlib.dev : $(LIB_MAK) $(ECHOGS_XE) $(seprlib_)
 	$(SETMOD) $(GLD)seprlib $(seprlib_)
 
@@ -2453,10 +2454,10 @@
 	$(gscdefs_h) $(gxdevice_h) $(gzstate_h)
 	$(GLCC) $(GLO_)gsnamecl.$(OBJ) $(C_) $(GLSRC)gsnamecl.c
 
-$(GLOBJ)gsncdemo.$(OBJ) : $(GLSRC)gsncdemo.c $(GXERR) $(stdpre_h) $(math_h)\
+$(GLOBJ)gsncdummy.$(OBJ) : $(GLSRC)gsncdummy.c $(GXERR) $(stdpre_h) $(math_h)\
        	$(memory__h) $(gscdefs_h) $(gscspace_h) $(gxdevice_h) $(gzstate_h)\
-	$(malloc__h)
-	$(GLCC) $(GLO_)gsncdemo.$(OBJ) $(C_) $(GLSRC)gsncdemo.c
+       	$(gsncdummy_h) $(malloc__h)
+	$(GLCC) $(GLO_)gsncdummy.$(OBJ) $(C_) $(GLSRC)gsncdummy.c
 
 # ================ Display Postscript extensions ================ #