diff options
| author | Henry Stiles <henry.stiles@artifex.com> | 2011-05-09 13:16:31 -0600 |
|---|---|---|
| committer | Henry Stiles <henry.stiles@artifex.com> | 2011-05-09 13:16:31 -0600 |
| commit | e55d362f3370b4bff0d72dc58c4b7a08b0dba71a (patch) | |
| tree | 7e49f35721ebcac4ce48b27e1fe6d8ca5b1c6802 | |
| parent | 60d4b088c6d314079643a92a3c4e983b116600a9 (diff) | |
Incorporate raster operation library into the core graphics library.
We were going to fold the roblib in for simplicity, more recently
the graphics library code has been refactored such that the raster op
library is always required. For example operations previously done in
the copy_mono code are now done with the raster op code.
CLUSTER_UNTESTED
| -rw-r--r-- | gs/base/Makefile.in | 2 | ||||
| -rw-r--r-- | gs/base/lib.mak | 17 | ||||
| -rw-r--r-- | gs/base/msvclib.mak | 2 | ||||
| -rw-r--r-- | gs/base/ugcclib.mak | 3 | ||||
| -rw-r--r-- | language_switch/pspcl6_gcc.mak | 1 | ||||
| -rw-r--r-- | language_switch/pspcl6_msvc.mak | 1 | ||||
| -rw-r--r-- | main/pcl6_gcc.mak | 2 | ||||
| -rw-r--r-- | main/pcl6_msvc.mak | 1 |
8 files changed, 7 insertions, 22 deletions
diff --git a/gs/base/Makefile.in b/gs/base/Makefile.in index bc0691550..cc825d5d2 100644 --- a/gs/base/Makefile.in +++ b/gs/base/Makefile.in @@ -429,7 +429,7 @@ SOC_LOADER = @SOC_LOADER@ # Choose the language feature(s) to include. See gs.mak for details. -FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev $(GLD)gsnogc.dev $(GLD)roplib.dev $(GLD)htxlib.dev $(PSD)fapi.dev @JBIG2DEVS@ @JPXDEVS@ @UTF8DEVS@ +FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev $(GLD)gsnogc.dev $(GLD)htxlib.dev $(PSD)fapi.dev @JBIG2DEVS@ @JPXDEVS@ @UTF8DEVS@ #FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev #FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(GLD)pipe.dev # The following is strictly for testing. diff --git a/gs/base/lib.mak b/gs/base/lib.mak index 64e96bfa2..28ee85f13 100644 --- a/gs/base/lib.mak +++ b/gs/base/lib.mak @@ -1215,11 +1215,11 @@ $(GLD)libd.dev : $(LIB_MAK) $(ECHOGS_XE) $(LIBd) $(GLD)libcore.dev : $(LIB_MAK) $(ECHOGS_XE)\ $(GLD)libs.dev $(GLD)libx.dev $(GLD)libd.dev\ - $(GLD)iscale.dev $(GLD)noroplib.dev $(GLD)strdline.dev + $(GLD)iscale.dev $(GLD)roplib.dev $(GLD)strdline.dev $(SETMOD) $(GLD)libcore $(ADDMOD) $(GLD)libcore -dev2 nullpage $(ADDMOD) $(GLD)libcore -include $(GLD)libs $(GLD)libx $(GLD)libd - $(ADDMOD) $(GLD)libcore -include $(GLD)iscale $(GLD)noroplib + $(ADDMOD) $(GLD)libcore -include $(GLD)iscale $(GLD)roplib $(ADDMOD) $(GLD)libcore -include $(GLD)strdline # ---------------- Stream support ---------------- # @@ -1912,17 +1912,7 @@ $(GLOBJ)gshtx.$(OBJ) : $(GLSRC)gshtx.c $(GXERR) $(memory__h)\ $(gxfmap_h) $(gshtx_h) $(gzht_h) $(gzstate_h) $(GLCC) $(GLO_)gshtx.$(OBJ) $(C_) $(GLSRC)gshtx.c -# ---------------- RasterOp et al ---------------- # -# Note that noroplib is a default, roplib replaces it. - -noroplib_=$(GLOBJ)gsnorop.$(OBJ) -$(GLD)noroplib.dev : $(LIB_MAK) $(ECHOGS_XE) $(noroplib_) - $(SETMOD) $(GLD)noroplib $(noroplib_) - -$(GLOBJ)gsnorop.$(OBJ) : $(GLSRC)gsnorop.c $(GXERR)\ - $(gdevmem_h) $(gdevmrop_h) $(gsrop_h)\ - $(gxdevcli_h) $(gxdevice_h) $(gxdevmem_h) - $(GLCC) $(GLO_)gsnorop.$(OBJ) $(C_) $(GLSRC)gsnorop.c +# ----- Ternary raster operations and device level transparency ------# roplib1_=$(GLOBJ)gdevdrop.$(OBJ) $(GLOBJ)gsroprun.$(OBJ) roplib2_=$(GLOBJ)gdevmr1.$(OBJ) $(GLOBJ)gdevmr2n.$(OBJ) $(GLOBJ)gdevmr8n.$(OBJ) @@ -1932,7 +1922,6 @@ $(GLD)roplib.dev : $(LIB_MAK) $(ECHOGS_XE) $(roplib_) $(SETMOD) $(GLD)roplib $(roplib1_) $(ADDMOD) $(GLD)roplib $(roplib2_) $(ADDMOD) $(GLD)roplib $(roplib3_) - $(ADDMOD) $(GLD)roplib -replace $(GLD)noroplib $(GLOBJ)gdevdrop.$(OBJ) : $(GLSRC)gdevdrop.c $(GXERR) $(memory__h)\ $(gsbittab_h) $(gsropt_h)\ diff --git a/gs/base/msvclib.mak b/gs/base/msvclib.mak index 8bb8403c6..3cdab5a00 100644 --- a/gs/base/msvclib.mak +++ b/gs/base/msvclib.mak @@ -377,7 +377,7 @@ SYNC=winsync # Choose the language feature(s) to include. See gs.mak for details. !ifndef FEATURE_DEVS -FEATURE_DEVS=$(GLD)psl3lib.dev $(GLD)path1lib.dev $(GLD)dps2lib.dev $(GLD)psl2cs.dev $(GLD)cielib.dev $(GLD)imasklib.dev $(GLD)patlib.dev $(GLD)htxlib.dev $(GLD)roplib.dev $(GLD)devcmap.dev $(GLD)bbox.dev $(GLD)pipe.dev +FEATURE_DEVS=$(GLD)psl3lib.dev $(GLD)path1lib.dev $(GLD)dps2lib.dev $(GLD)psl2cs.dev $(GLD)cielib.dev $(GLD)imasklib.dev $(GLD)patlib.dev $(GLD)htxlib.dev $(GLD)devcmap.dev $(GLD)bbox.dev $(GLD)pipe.dev !endif # Choose whether to compile the .ps initialization files into the executable. diff --git a/gs/base/ugcclib.mak b/gs/base/ugcclib.mak index 64d67278f..eec24d573 100644 --- a/gs/base/ugcclib.mak +++ b/gs/base/ugcclib.mak @@ -111,8 +111,7 @@ SYNC=posync FEATURE_DEVS=$(GLD)dps2lib.dev $(GLD)psl2cs.dev $(GLD)cielib.dev\ $(GLD)psl3lib.dev $(GLD)path1lib.dev $(GLD)patlib.dev $(GLD)htxlib.dev\ - $(GLD)cidlib.dev $(GLD)psf0lib.dev $(GLD)psf1lib.dev\ - $(GLD)roplib.dev + $(GLD)cidlib.dev $(GLD)psf0lib.dev $(GLD)psf1lib.dev COMPILE_INITS?=0 BAND_LIST_STORAGE=file diff --git a/language_switch/pspcl6_gcc.mak b/language_switch/pspcl6_gcc.mak index 76d44d6e0..97345056e 100644 --- a/language_switch/pspcl6_gcc.mak +++ b/language_switch/pspcl6_gcc.mak @@ -67,7 +67,6 @@ FEATURE_DEVS ?= \ $(DD)pdf.dev \ $(DD)dpsnext.dev \ $(DD)htxlib.dev \ - $(DD)roplib.dev \ $(DD)ttfont.dev \ $(DD)pipe.dev \ $(DD)gsnogc.dev \ diff --git a/language_switch/pspcl6_msvc.mak b/language_switch/pspcl6_msvc.mak index bd9db3573..42d5af0f4 100644 --- a/language_switch/pspcl6_msvc.mak +++ b/language_switch/pspcl6_msvc.mak @@ -228,7 +228,6 @@ FEATURE_CORE = \ $(DD)\pdf.dev \ $(DD)\dpsnext.dev \ $(DD)\htxlib.dev \ - $(DD)\roplib.dev \ $(DD)\ttfont.dev \ $(DD)\gsnogc.dev \ $(DD)\pipe.dev diff --git a/main/pcl6_gcc.mak b/main/pcl6_gcc.mak index 19acca50c..3b4bee388 100644 --- a/main/pcl6_gcc.mak +++ b/main/pcl6_gcc.mak @@ -228,7 +228,7 @@ DEVICES_DEVS?=$(DD)ljet4.dev $(DD)djet500.dev $(DD)cljet5pr.dev $(DD)cljet5c.dev $(DD)romfs$(COMPILE_INITS).dev FEATURE_DEVS?=$(DD)colimlib.dev $(DD)dps2lib.dev $(DD)path1lib.dev\ - $(DD)patlib.dev $(DD)psl2cs.dev $(DD)rld.dev $(DD)roplib.dev\ + $(DD)patlib.dev $(DD)psl2cs.dev $(DD)rld.dev\ $(DD)gxfapiu$(UFST_BRIDGE).dev\ $(DD)ttflib.dev $(DD)cielib.dev $(DD)pipe.dev $(DD)htxlib.dev\ $(DD)sdctd.dev $(DD)libpng_$(SHARE_LIBPNG).dev\ diff --git a/main/pcl6_msvc.mak b/main/pcl6_msvc.mak index 7b424d9dd..35c969a59 100644 --- a/main/pcl6_msvc.mak +++ b/main/pcl6_msvc.mak @@ -406,7 +406,6 @@ FEATURE_DEVS = $(DD)\dps2lib.dev \ $(DD)\gxfapiu$(UFST_BRIDGE).dev\ $(DD)\rld.dev \ $(DD)\psl2cs.dev \ - $(DD)\roplib.dev \ $(DD)\ttflib.dev \ $(DD)\colimlib.dev \ $(DD)\cielib.dev \ |