[gs-commits] ghostpdl branch, pdfi, updated. jbig2dec-0.14-2716-g32f5dc4

[email protected] (Ken Sharp) Mon, 6 Jan 2020 12:26:09 +0000 (UTC)
Newsgroups gmane.comp.printing.ghostscript.cvs
Message-ID <[email protected]>
The ghostpdl branch, pdfi has been updated
       via  32f5dc452ddd693a3eb47b97afcb822f0f835f80 (commit)
       via  1085ead1dd22e3908c341df160a722e71a9c7cfe (commit)
      from  139a0172b418e1edc581479ca6d6b87ac705341c (commit)

----------------------------------------------------------------------
commit 32f5dc452ddd693a3eb47b97afcb822f0f835f80
Merge: 139a017 1085ead
Author: Ken Sharp <[email protected]>
Date:   Mon Jan 6 12:11:52 2020 +0000

    Merge branch 'master' into pdfi

diff --cc windows/GhostPDL.sln
index 160c3a3,73ef4dd..cb3b953
--- a/windows/GhostPDL.sln
+++ b/windows/GhostPDL.sln
@@@ -139,74 -101,22 +103,62 @@@ Globa
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.Debug|x64.ActiveCfg = Debug|x64
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.Debug-contrib|Win32.ActiveCfg = Debug-contrib|Win32
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.Debug-contrib|x64.ActiveCfg = Debug-contrib|x64
- 		{C4038125-61B9-4147-9EA8-39690BA3A599}.Debug-contrib|x64.Build.0 = Debug-contrib|x64
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.Debug-cups|Win32.ActiveCfg = Debug-cups|Win32
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.Debug-cups|x64.ActiveCfg = Debug-cups|x64
- 		{C4038125-61B9-4147-9EA8-39690BA3A599}.Debug-cups|x64.Build.0 = Debug-cups|x64
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.DebugXP|Win32.ActiveCfg = DebugXP|Win32
- 		{C4038125-61B9-4147-9EA8-39690BA3A599}.DebugXP|Win32.Build.0 = DebugXP|Win32
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.DebugXP|x64.ActiveCfg = DebugXP|x64
- 		{C4038125-61B9-4147-9EA8-39690BA3A599}.DebugXP|x64.Build.0 = DebugXP|x64
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.Memento|Win32.ActiveCfg = Memento|Win32
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.Memento|x64.ActiveCfg = Memento|x64
- 		{C4038125-61B9-4147-9EA8-39690BA3A599}.Memento|x64.Build.0 = Memento|x64
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.MementoXP|Win32.ActiveCfg = MementoXP|Win32
- 		{C4038125-61B9-4147-9EA8-39690BA3A599}.MementoXP|Win32.Build.0 = MementoXP|Win32
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.MementoXP|x64.ActiveCfg = MementoXP|x64
- 		{C4038125-61B9-4147-9EA8-39690BA3A599}.MementoXP|x64.Build.0 = MementoXP|x64
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.Profile|Win32.ActiveCfg = Profile|Win32
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.Profile|x64.ActiveCfg = Profile|x64
- 		{C4038125-61B9-4147-9EA8-39690BA3A599}.Profile|x64.Build.0 = Profile|x64
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.Release|Win32.ActiveCfg = Release|Win32
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.Release|x64.ActiveCfg = Release|x64
- 		{C4038125-61B9-4147-9EA8-39690BA3A599}.Release|x64.Build.0 = Release|x64
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.Release-contrib|Win32.ActiveCfg = Release-contrib|Win32
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.Release-contrib|x64.ActiveCfg = Release-contrib|x64
- 		{C4038125-61B9-4147-9EA8-39690BA3A599}.Release-contrib|x64.Build.0 = Release-contrib|x64
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
- 		{C4038125-61B9-4147-9EA8-39690BA3A599}.ReleaseXP|Win32.Build.0 = ReleaseXP|Win32
  		{C4038125-61B9-4147-9EA8-39690BA3A599}.ReleaseXP|x64.ActiveCfg = ReleaseXP|x64
- 		{C4038125-61B9-4147-9EA8-39690BA3A599}.ReleaseXP|x64.Build.0 = ReleaseXP|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Debug|Win32.ActiveCfg = Debug|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Debug|Win32.Build.0 = Debug|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Debug|x64.ActiveCfg = Debug|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Debug|x64.Build.0 = Debug|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Debug-contrib|Win32.ActiveCfg = Debug-contrib|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Debug-contrib|Win32.Build.0 = Debug-contrib|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Debug-contrib|x64.ActiveCfg = Debug-contrib|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Debug-contrib|x64.Build.0 = Debug-contrib|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Debug-cups|Win32.ActiveCfg = Debug-cups|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Debug-cups|Win32.Build.0 = Debug-cups|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Debug-cups|x64.ActiveCfg = Debug-cups|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Debug-cups|x64.Build.0 = Debug-cups|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.DebugXP|Win32.ActiveCfg = Debug-contrib|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.DebugXP|Win32.Build.0 = Debug-contrib|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.DebugXP|x64.ActiveCfg = Debug-contrib|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.DebugXP|x64.Build.0 = Debug-contrib|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Memento|Win32.ActiveCfg = Memento|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Memento|Win32.Build.0 = Memento|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Memento|x64.ActiveCfg = Memento|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Memento|x64.Build.0 = Memento|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.MementoXP|Win32.ActiveCfg = Memento|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.MementoXP|Win32.Build.0 = Memento|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.MementoXP|x64.ActiveCfg = Memento|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.MementoXP|x64.Build.0 = Memento|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Profile|Win32.ActiveCfg = Profile|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Profile|Win32.Build.0 = Profile|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Profile|x64.ActiveCfg = Profile|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Profile|x64.Build.0 = Profile|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Release|Win32.ActiveCfg = Release|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Release|Win32.Build.0 = Release|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Release|x64.ActiveCfg = Release|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Release|x64.Build.0 = Release|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Release-contrib|Win32.ActiveCfg = Release-contrib|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Release-contrib|Win32.Build.0 = Release-contrib|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Release-contrib|x64.ActiveCfg = Release-contrib|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.Release-contrib|x64.Build.0 = Release-contrib|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.ReleaseXP|Win32.ActiveCfg = Release-contrib|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.ReleaseXP|Win32.Build.0 = Release-contrib|Win32
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.ReleaseXP|x64.ActiveCfg = Release-contrib|x64
 +		{4C038125-61B9-4147-9EA8-39690BA3A599}.ReleaseXP|x64.Build.0 = Release-contrib|x64
  		{98351FEF-0032-457C-B9D9-D6B68A829386}.Debug|Win32.ActiveCfg = Debug|Win32
  		{98351FEF-0032-457C-B9D9-D6B68A829386}.Debug|Win32.Build.0 = Debug|Win32
  		{98351FEF-0032-457C-B9D9-D6B68A829386}.Debug|x64.ActiveCfg = Debug|x64


Summary of changes:
 windows/GhostPDL.sln | 66 ++++++++++------------------------------------------
 1 file changed, 12 insertions(+), 54 deletions(-)