[gs-commits] ghostpdl branch, pdfi, updated. jbig2dec-0.14-2620-g20de60f
[email protected] (Ken Sharp) Tue, 26 Nov 2019 10:41:51 +0000 (UTC)
| Newsgroups | gmane.comp.printing.ghostscript.cvs |
|---|---|
| Message-ID | <[email protected]> |
The ghostpdl branch, pdfi has been updated
via 20de60fb65962ca37cb8d9e9fe45b80a18f8405f (commit)
via 34fc5a7613eea288a8426d3be425c93647954668 (commit)
via a570a05622cb178c031db64711b412cf640038b2 (commit)
via fee6b609fbb8d1f0744f98ee3bf930c1fd733660 (commit)
via f3b0a9e346a97b23f1f7e016944be514c8b0ec78 (commit)
via 8a589c19d62884388cb9eff7d12bfba568e667ca (commit)
via 79e11b98dc078fcd92cda588ab6157a4aa14d0f0 (commit)
via 113792dd347ac7b9436b9517aca91e1153fb230d (commit)
via 12eef95ef9ed7a086ca02f06ef93acce9c9a2676 (commit)
via ab089bf9511ccaa30a33d6e269ab0dae98ff5517 (commit)
via e056194328312f724089d52398e88c5a6a2fe277 (commit)
via e9ff39ee82680ea1719ddf99cf3809e26df0c946 (commit)
via 354715346deed252ef7db53160b61d04bd630a2f (commit)
via b8c8a6410658fdfe57ad5de4ae57fdc4cbece2ab (commit)
via 882793bc7f35f21f7857e216966c0b777140a87c (commit)
via 8f611a6c45fafbea495206773eccf3028cfb4765 (commit)
via f734274b455c321a4089d8ee7efa7511656ae9c6 (commit)
via 17a947dcc56fee115d7b416de7648289b04185f8 (commit)
via cbd8765cc2e5d67eae3d412a7584f37a9e02f2e9 (commit)
via 3ee9bb6efff8929ff8df4fb7ca42001c2aeacdf6 (commit)
via 67a59c12667bbdddf67e78d9496f94b34d55e702 (commit)
via 3819f5121013dd93dd3653475e686d8f6df9b068 (commit)
via 3b8f96dbe2dc0ab0cdbbf076cdb88e21c91639a5 (commit)
via 4b31b05c2db5967c00d0b08023167935bbb3d015 (commit)
via 1098cdd54a46dca9ca976b750ba25d0b714dfd9f (commit)
via 1f60fa73b7c6b5acfae75b6e4a1fede2b75ea1c4 (commit)
via 3e01cc30c90094bcbef2966f1048c504e6b5361e (commit)
via b93f218d418827b689c61b37941ffd4eef0c0d84 (commit)
via 87cd6160bf654a164469e75a9df7cc7b690b5aaa (commit)
via 53a370b272a89df418ea563f1abde7d774579105 (commit)
via 7fe9289f10c47fe7557375c23b54cd87e521d11c (commit)
via 810c897c51e28dcdd589e1561af36769e72e0893 (commit)
via d48555f7777a983e0d15972f3838bb5583e20657 (commit)
via 4db291eb31b4dc8c6864e438acdd9283c3347671 (commit)
via 0bc5d53fa1c0d7832008d1ae8e0e6804bf5f9e9e (commit)
via efafc6f95b0bfedf63efafc55416846974a67bcc (commit)
via 0243f6288ca26b2985f0778040feebae7322ac0b (commit)
via d9d92ab6b774914d81f63c8e19d78e4022ad9976 (commit)
via 0129596f6cf2d090ed46f9a9c8189ab60b56735f (commit)
via e0c2e4d8f43d6e83a0a04e6d2c350d2d7fc1e7a6 (commit)
via 23ea32bf2bd205c44c9a7979b3a187199e47da59 (commit)
via 0c30c4cda3c2487ce52f79a952e3d0febef1d8bd (commit)
via 7043e985298f75291e1fc25ad272140be31ffe6d (commit)
via aa30c0798d32decfd99ff8149553221917d4301e (commit)
via 4640b5abd48430bfc76cc4e98cd626aa64075537 (commit)
via 9189e54333d33104a0de8aa92b1c5a7662762048 (commit)
via 84a1bd8c73d740022877a5911851b8521ecc7458 (commit)
via aaea09a9a0e357b2784536b8476f4ab4fee19b64 (commit)
via 64a35dc73ee8256421b1dd2760be0c73c05eadb8 (commit)
via 317c0154a8141b8dde6e303f1e18a95e01f8ee33 (commit)
via c7c6043bde1517e8fd6d645d7c34142aec462248 (commit)
via 2d84ecc57837785b566ebd9d5909ba9edc9d697f (commit)
via 327dc8943c0aac1c7be7a1fb6e93346b61cd0900 (commit)
via e20cd8d8fc1f40bf4218c18e545ca4ddb175c348 (commit)
via 7a56ef4aed70a50bcd7731b61e59850e98d08a4d (commit)
via 5e60fc862a73898ce048730d0c23c00b9ddb5578 (commit)
from 28961247238d9ddd775072aeba7868846bbcc91c (commit)
----------------------------------------------------------------------
commit 20de60fb65962ca37cb8d9e9fe45b80a18f8405f
Merge: 2896124 34fc5a7
Author: Ken Sharp <[email protected]>
Date: Tue Nov 26 10:24:09 2019 +0000
Merge branch 'master' into pdfi
diff --cc Makefile.in
index ff229be,57d29c1..853f1dc
--- a/Makefile.in
+++ b/Makefile.in
@@@ -186,22 -188,24 +192,28 @@@ PCL_SONAME_MAJOR_MINOR=@PCL_SONAME_MAJO
XPS=@XPS@
XPS_SO_BASE=@XPS@
+ XPS_SONAME=@XPS_SONAME@
+ XPS_SONAME_MAJOR=@XPS_SONAME_MAJOR@
+ XPS_SONAME_MAJOR_MINOR=@XPS_SONAME_MAJOR_MINOR@
+PDF=@PDF@
+PDF_SO_BASE=@PDF@
+
GPDL=@GPDL@
GPDL_SO_BASE=@GPDL@
+ GPDL_SONAME=@GPDL_SONAME@
+ GPDL_SONAME_MAJOR=@GPDL_SONAME_MAJOR@
+ GPDL_SONAME_MAJOR_MINOR=@GPDL_SONAME_MAJOR_MINOR@
XE=@EXEEXT@
- XEAUX=@EXEEXT@
+ XEAUX=@AUXEXEEXT@
PCL_TARGET=@PCL_TARGET@
XPS_TARGET=@XPS_TARGET@
+PDF_TARGET=@PDF_TARGET@
GPDL_TARGET=@GPDL_TARGET@
- PCL_XPS_TARGETS=$(PCL_TARGET) $(XPS_TARGET) $(PDF_TARGET) @GPDL_TARGET_VAR@
-PCL_XPS_PDL_TARGETS=$(PCL_TARGET) $(XPS_TARGET) $(GPDL_TARGET)
++PCL_XPS_PDL_TARGETS=$(PCL_TARGET) $(XPS_TARGET) $(GPDL_TARGET) $(PDF_TARGET)
# Define the directories for debugging and profiling binaries, relative to
# the standard binaries.
diff --cc base/unix-dll.mak
index bacac41,0f9fd94..a5d1b1e
--- a/base/unix-dll.mak
+++ b/base/unix-dll.mak
@@@ -71,25 -66,21 +71,25 @@@ GPDL_SONAME_BASE=lib$(GPDL_SO_BASE
GS_SOEXT=$(SO_LIB_EXT)
GS_DLLEXT=$(DLL_EXT)
- GS_SONAME=$(GS_SONAME_BASE)$(GS_SOEXT)$(GS_DLLEXT)
- GS_SONAME_MAJOR=$(GS_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(GS_DLLEXT)
- GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MINOR)$(GS_DLLEXT)
+ #GS_SONAME=$(GS_SONAME_BASE)$(GS_SOEXT)$(GS_DLLEXT)
+ #GS_SONAME_MAJOR=$(GS_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(GS_DLLEXT)
+ #GS_SONAME_MAJOR_MINOR=$(GS_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MINOR)$(GS_DLLEXT)
- PCL_SONAME=$(PCL_SONAME_BASE)$(GS_SOEXT)$(GS_DLLEXT)
- PCL_SONAME_MAJOR=$(PCL_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(GS_DLLEXT)
- PCL_SONAME_MAJOR_MINOR=$(PCL_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MINOR)$(GS_DLLEXT)
+ #PCL_SONAME=$(PCL_SONAME_BASE)$(GS_SOEXT)$(GS_DLLEXT)
+ #PCL_SONAME_MAJOR=$(PCL_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(GS_DLLEXT)
+ #PCL_SONAME_MAJOR_MINOR=$(PCL_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MINOR)$(GS_DLLEXT)
- XPS_SONAME=$(XPS_SONAME_BASE)$(GS_SOEXT)$(GS_DLLEXT)
- XPS_SONAME_MAJOR=$(XPS_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(GS_DLLEXT)
- XPS_SONAME_MAJOR_MINOR=$(XPS_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MINOR)$(GS_DLLEXT)
+ #XPS_SONAME=$(XPS_SONAME_BASE)$(GS_SOEXT)$(GS_DLLEXT)
+ #XPS_SONAME_MAJOR=$(XPS_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(GS_DLLEXT)
+ #XPS_SONAME_MAJOR_MINOR=$(XPS_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MINOR)$(GS_DLLEXT)
- PDF_SONAME=$(PDF_SONAME_BASE)$(GS_SOEXT)$(GS_DLLEXT)
- PDF_SONAME_MAJOR=$(PDF_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(GS_DLLEXT)
- PDF_SONAME_MAJOR_MINOR=$(PDF_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MINOR)$(GS_DLLEXT)
++#PDF_SONAME=$(PDF_SONAME_BASE)$(GS_SOEXT)$(GS_DLLEXT)
++#PDF_SONAME_MAJOR=$(PDF_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(GS_DLLEXT)
++#PDF_SONAME_MAJOR_MINOR=$(PDF_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MINOR)$(GS_DLLEXT)
+
- GPDL_SONAME=$(GPDL_SONAME_BASE)$(GS_SOEXT)$(GS_DLLEXT)
- GPDL_SONAME_MAJOR=$(GPDL_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(GS_DLLEXT)
- GPDL_SONAME_MAJOR_MINOR=$(GPDL_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MINOR)$(GS_DLLEXT)
+ #GPDL_SONAME=$(GPDL_SONAME_BASE)$(GS_SOEXT)$(GS_DLLEXT)
+ #GPDL_SONAME_MAJOR=$(GPDL_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(GS_DLLEXT)
+ #GPDL_SONAME_MAJOR_MINOR=$(GPDL_SONAME_BASE)$(GS_SOEXT)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MAJOR)$(SO_LIB_VERSION_SEPARATOR)$(GS_VERSION_MINOR)$(GS_DLLEXT)
#LDFLAGS_SO=-shared -Wl,-soname=$(GS_SONAME_MAJOR)
diff --cc configure.ac
index 2b5d18f,d6d4d6a..39808e4
--- a/configure.ac
+++ b/configure.ac
@@@ -2635,31 -2771,35 +2792,37 @@@ case $host i
DYNAMIC_LIBS=""
SO_LIB_EXT=".dylib"
;;
- SunOS)
+ *-sun*)
if test $ac_cv_prog_gcc = yes; then
- DYNAMIC_CFLAGS="-fPIC"
+ DYNAMIC_CFLAGS="-fPIC $DYNAMIC_CFLAGS"
else
- DYNAMIC_CFLAGS="-KPIC"
+ DYNAMIC_CFLAGS="-KPIC $DYNAMIC_CFLAGS"
+ #if test x$hide_symbols = xyes; then
+ # attr_default="__global"
+ # attr_hidden="__hidden"
+ # _ldflags="-xldscope=hidden"
+ #fi
+ # ^^^ untested
fi
- GS_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GS_SONAME_MAJOR)"
- PCL_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR)"
- XPS_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(XPS_SONAME_MAJOR)"
- PDL_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GPDL_SONAME_MAJOR)"
+ GS_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GS_SONAME_MAJOR) $_ldflags"
+ PCL_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(PCL_SONAME_MAJOR) $_ldflags"
+ XPS_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(XPS_SONAME_MAJOR) $_ldflags"
+ PDL_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GPDL_SONAME_MAJOR) $_ldflags"
+ PDF_DYNAMIC_LDFLAGS="-G -shared -Wl,\$(LD_SET_DT_SONAME)\$(LDFLAGS_SO_PREFIX)\$(GPDF_SONAME_MAJOR)"
DYNAMIC_LIBS=""
SO_LIB_EXT=".so"
- ;;
- AIX)
+ ;;
+ *-aix*)
if test $ac_cv_prog_gcc = yes; then
- DYNAMIC_CFLAGS="-fPIC"
+ DYNAMIC_CFLAGS="-fPIC $DYNAMIC_CFLAGS"
GCFLAGS="-Wl,-brtl -D_LARGE_FILES $GCFLAGS"
GS_DYNAMIC_LDFLAGS="-shared -Wl,-brtl,-G -fPIC"
PCL_DYNAMIC_LDFLAGS="-shared -Wl,-brtl,-G -fPIC"
XPS_DYNAMIC_LDFLAGS="-shared -Wl,-brtl,-G -fPIC"
PDL_DYNAMIC_LDFLAGS="-shared -Wl,-brtl,-G -fPIC"
+ PDF_DYNAMIC_LDFLAGS="-shared -Wl,-brtl,-G -fPIC"
else
- DYNAMIC_CFLAGS=""
+ DYNAMIC_CFLAGS="$DYNAMIC_CFLAGS"
GCFLAGS="-Wl,-brtl -D_LARGE_FILES $GCFLAGS"
GS_DYNAMIC_LDFLAGS="-G -qmkshrobj -Wl,-brtl,-G"
PCL_DYNAMIC_LDFLAGS="-G -qmkshrobj -Wl,-brtl,-G"
diff --cc psi/msvc.mak
index b165a61,5500d43..2030cbd
--- a/psi/msvc.mak
+++ b/psi/msvc.mak
@@@ -315,7 -291,7 +315,7 @@@ PDF_TARGET=gpd
GPDL_TARGET=gpdl
!endif
- PCL_XPS_TARGETS=$(PCL_TARGET) $(XPS_TARGET) $(PDF_TARGET)
-PCL_XPS_PDL_TARGETS=$(PCL_TARGET) $(XPS_TARGET) $(GPDL_TARGET)
++PCL_XPS_PDL_TARGETS=$(PCL_TARGET) $(XPS_TARGET) $(GPDL_TARGET) $(PDF_TARGET)
# Define the root directory for Ghostscript installation.
Summary of changes:
.gitignore | 3 +
Makefile.in | 21 +-
Resource/Init/gs_fonts.ps | 2 +-
arch/arch_autoconf.h.in | 3 +
autogen.sh | 25 +-
base/gdevp14.c | 69 +++-
base/gp.h | 6 +-
base/gp_unix.c | 54 +++
base/gs.mak | 6 +-
base/gsicc_manage.c | 2 +-
base/gstrans.h | 3 +-
base/gsutil.c | 2 -
base/gxclfile.c | 3 +-
base/gxclist.c | 3 +-
base/lib.mak | 32 +-
base/mkromfs.c | 69 ++--
base/unix-dll.mak | 30 +-
base/unix-gcc.mak | 2 +-
configure.ac | 799 ++++++++++++++++++++++++++----------------
contrib/gdevcd8.c | 3 +-
contrib/gdevhl12.c | 2 +-
contrib/gdevop4w.c | 2 +
contrib/japanese/gdevp201.c | 34 +-
cups/gdevcups.c | 6 +-
devices/gdevatx.c | 7 +-
devices/gdevmgr.c | 1 -
doc/Fonts.htm | 15 +-
doc/GS9_Color_Management.pdf | Bin 2195244 -> 6606532 bytes
doc/GS9_Color_Management.tex | 44 +--
doc/Use.htm | 5 +-
gpdl/gpdl.mak | 33 +-
gpdl/jbig2top.c | 814 +++++++++++++++++++++++++++++++++++++++++++
gpdl/jp2ktop.c | 737 +++++++++++++++++++++++++++++++++++++++
gpdl/jpgtop.c | 34 +-
gpdl/psitop.c | 2 +-
gpdl/pwgtop.c | 29 +-
gpdl/tifftop.c | 49 +--
jbig2dec/jbig2.c | 2 +-
jbig2dec/jbig2_generic.c | 2 +-
jbig2dec/jbig2_priv.h | 6 +-
jbig2dec/jbig2_segment.c | 2 +-
jbig2dec/jbig2_symbol_dict.c | 10 +-
lcms2mt/src/cmsio1.c | 13 +-
pcl/pcl/pcstatus.c | 7 +-
pcl/pcl/pgconfig.c | 2 +-
pcl/pcl/rtraster.c | 6 +-
pcl/pl/pjparse.c | 8 +
pcl/pl/plimpl.c | 10 +
pcl/pl/plmain.c | 26 +-
pcl/pxl/pxl.mak | 2 +-
pcl/pxl/pxparse.c | 2 +-
pcl/pxl/pxpthr.c | 218 ++++++------
pcl/pxl/pxpthr.h | 6 +-
pcl/pxl/pxsessio.c | 4 +-
pcl/pxl/pxstate.c | 4 +
pcl/pxl/pxstate.h | 24 ++
psi/iapi.h | 11 +-
psi/msvc.mak | 4 +-
psi/nsisinst.nsi | 27 +-
psi/zfile.c | 5 +-
windows/ghostpdl.vcproj | 8 +
61 files changed, 2686 insertions(+), 674 deletions(-)
create mode 100644 gpdl/jbig2top.c
create mode 100644 gpdl/jp2ktop.c