Squashed commit fill-stroke3 branch

This branch had several contributors including Robin Watts,
Ken Sharp and Ray Johnston.

The intent was to add a "fill and stroke" path device method
to ensure we get proper rendering when doing fill/stroke
methods with overprint and transparency.  In addition,
adding the method made it possible for pdfwrite to match
the original pdf source file if it also had fill/stroke methods.

The interaction with overprint and transparency led to significant
changes in parts of the code related to those sections.  In particular,
overprint was reworked to ensure that the overprint compositor and
the transparency compositor were aware if it was to be using
the overprint drawn_comps for stroke or for fill.  The code was
rewritten so that the overprint compositor actions only occurred when
an actual operation occurred (e.g. fill, stroke, image, text) as opposed
to every time that the overprint graphic state values changed.

When there is a fill-stroke operation with transparency, depending upon the
graphic state values, a non-isolated knockout group may be pushed.  From this,
an issue with knockout groups within knockout groups was revealed, which was
related to the backdrop selection.  The backdrop selection code was simplified.

3 files changed, 17 insertions, 1 deletions

diff --git a/lcms2mt/ChangeLog b/lcms2mt/ChangeLog
index 49342f049..9a30cd419 100644
--- a/lcms2mt/ChangeLog
+++ b/lcms2mt/ChangeLog
@@ -28,7 +28,7 @@ Several fixes related with security, and therefore not detailed here.
 C++ compiles now without warnings
 Added OSX and clang in travis
 Added a travis-ci test matrix for many compilers and OS. Thanks to Thomas Weber (debian) for this great improvement.
-testbed can now work with dynamic versions of library 
+testbed can now work with dynamic versions of library
 Fixed wrong planar formatters regarding linestride interpretation
 
 -----------------------
diff --git a/lcms2mt/Projects/VC2010/lcms2mt.rc b/lcms2mt/Projects/VC2010/lcms2mt.rc
index 2d0d0a8ff..65f192bc6 100644
--- a/lcms2mt/Projects/VC2010/lcms2mt.rc
+++ b/lcms2mt/Projects/VC2010/lcms2mt.rc
@@ -66,12 +66,20 @@ END
 // TEXTINCLUDE
 //
 
+<<<<<<< e2c48062c190a618a765f443fdfcac76a80d684d
 1 TEXTINCLUDE 
+=======
+1 TEXTINCLUDE
+>>>>>>> Pull in newly merged and updated LCMS2MT from MuPDF thirdparty repo.
 BEGIN
     "resource.h\0"
 END
 
+<<<<<<< e2c48062c190a618a765f443fdfcac76a80d684d
 2 TEXTINCLUDE 
+=======
+2 TEXTINCLUDE
+>>>>>>> Pull in newly merged and updated LCMS2MT from MuPDF thirdparty repo.
 BEGIN
     "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
     "#include ""windows.h""\r\n"
@@ -79,7 +87,11 @@ BEGIN
     "\0"
 END
 
+<<<<<<< e2c48062c190a618a765f443fdfcac76a80d684d
 3 TEXTINCLUDE 
+=======
+3 TEXTINCLUDE
+>>>>>>> Pull in newly merged and updated LCMS2MT from MuPDF thirdparty repo.
 BEGIN
     "\r\n"
     "\0"
@@ -101,4 +113,7 @@ END
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
+<<<<<<< e2c48062c190a618a765f443fdfcac76a80d684d
 
+=======
+>>>>>>> Pull in newly merged and updated LCMS2MT from MuPDF thirdparty repo.
diff --git a/lcms2mt/config.guess b/lcms2mt/config.guess
index e7464614e..82e59e2a7 100755
--- a/lcms2mt/config.guess
+++ b/lcms2mt/config.guess
@@ -1101,6 +1101,7 @@ EOF
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configuration will decide that
+        # prints for the "djgpp" host, or else GDB configuration will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;