[poppler] Branch 'poppler-0.20' - poppler/PSOutputDev.cc

[Albert Astals Cid]

 poppler/PSOutputDev.cc |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

New commits:
commit 02c4e6bf4cc0f5535946fe31815081a40b1de986
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Jun 29 01:56:55 2012 +0200

    PSOutputDev: Correct %%DocumentCustomColors
    
    Bug 51479

diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
index c655652..8f8107b 100644
--- a/poppler/PSOutputDev.cc
+++ b/poppler/PSOutputDev.cc
@@ -3984,6 +3984,26 @@ void PSOutputDev::addCustomColor(GfxSeparationColorSpace *sepCS) {
   GfxColor color;
   GfxCMYK cmyk;
 
+  if (!sepCS->getName()->cmp("Black")) {
+    processColors |= psProcessBlack;
+    return;
+  }
+  if (!sepCS->getName()->cmp("Cyan")) {
+    processColors |= psProcessCyan;
+    return;
+  }
+  if (!sepCS->getName()->cmp("Yellow")) {
+    processColors |= psProcessYellow;
+    return;
+  }
+  if (!sepCS->getName()->cmp("Magenta")) {
+    processColors |= psProcessMagenta;
+    return;
+  }
+  if (!sepCS->getName()->cmp("All")) 
+    return;
+  if (!sepCS->getName()->cmp("None")) 
+    return;
   for (cc = customColors; cc; cc = cc->next) {
     if (!cc->name->cmp(sepCS->getName())) {
       return;