[poppler] Branch 'xpdf303merge' - 2 commits - poppler/GfxState.cc utils/pdftoppm.cc

[Albert Astals Cid]

 poppler/GfxState.cc |    2 +-
 utils/pdftoppm.cc   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a63128179c65b5d9d6d9d41fa601a593b0a05d94
Author: Thomas Freitag <Thomas.Freitag at kabelmail.de>
Date:   Thu Feb 9 22:02:52 2012 +0100

    [xpdf303] Fix merge issue

diff --git a/utils/pdftoppm.cc b/utils/pdftoppm.cc
index a02da29..222c89b 100644
--- a/utils/pdftoppm.cc
+++ b/utils/pdftoppm.cc
@@ -369,7 +369,7 @@ int main(int argc, char *argv[]) {
 #if SPLASH_CMYK
 				    (jpegcmyk || overprint) ? splashModeCMYK8 :
 #endif
-				             splashModeBGR8, 4,
+				             splashModeRGB8, 4,
 				  gFalse, paperColor);
   splashOut->startDoc(doc);
   if (sz != 0) w = h = sz;
commit cd5a6a4d02e579e543067d1847164aff90363f16
Author: Thomas Freitag <Thomas.Freitag at kabelmail.de>
Date:   Thu Feb 9 22:01:42 2012 +0100

    [xpdf303] Fix merge bug

diff --git a/poppler/GfxState.cc b/poppler/GfxState.cc
index c62ce45..beb38f3 100644
--- a/poppler/GfxState.cc
+++ b/poppler/GfxState.cc
@@ -5207,7 +5207,7 @@ void GfxImageColorMap::getCMYK(Guchar *x, GfxCMYK *cmyk) {
 
   if (colorSpace2) {
     for (i = 0; i < nComps2; ++i) {
-      color.c[i] = lookup[i][x[0]];
+      color.c[i] = lookup2[i][x[0]];
     }
     colorSpace2->getCMYK(&color, cmyk);
   } else {