[poppler] 2 commits - goo/PNGWriter.h poppler/GfxState.cc utils/HtmlOutputDev.cc utils/pdftocairo.cc

[Albert Astals Cid]

 goo/PNGWriter.h        |    2 +-
 poppler/GfxState.cc    |    2 +-
 utils/HtmlOutputDev.cc |    2 +-
 utils/pdftocairo.cc    |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 63da26f8fb0b2b5ffaa127762d4e36d995c482ee
Author: Thomas Freitag <Thomas.Freitag at alfa.de>
Date:   Tue Aug 27 20:40:29 2013 +0200

    resolve copy&paste error

diff --git a/poppler/GfxState.cc b/poppler/GfxState.cc
index 667a569..d723833 100644
--- a/poppler/GfxState.cc
+++ b/poppler/GfxState.cc
@@ -5516,7 +5516,7 @@ GfxImageColorMap::GfxImageColorMap(int bitsA, Object *decode,
     }
     break;
   default:
-    if (colorSpace->useGetGrayLine() || colorSpace->useGetRGBLine() || colorSpace->useGetCMYKLine() || colorSpace2->useGetDeviceNLine()) {
+    if (colorSpace->useGetGrayLine() || colorSpace->useGetRGBLine() || colorSpace->useGetCMYKLine() || colorSpace->useGetDeviceNLine()) {
       byte_lookup = (Guchar *)gmallocn ((maxPixel + 1), nComps);
       useByteLookup = gTrue;
     }
commit f58e9b64d5cf62906876c5c0f8da0f3c2c6c2bac
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Aug 26 00:27:59 2013 +0200

    Some more files Adrian has changed

diff --git a/goo/PNGWriter.h b/goo/PNGWriter.h
index 64b8833..90a298e 100644
--- a/goo/PNGWriter.h
+++ b/goo/PNGWriter.h
@@ -8,7 +8,7 @@
 // Copyright (C) 2009 Shen Liang <shenzhuxi at gmail.com>
 // Copyright (C) 2009, 2011-2013 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2009 Stefan Thomas <thomas at eload24.com>
-// Copyright (C) 2010, 2011 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2010, 2011, 2013 Adrian Johnson <ajohnson at redneon.com>
 // Copyright (C) 2012 Pino Toscano <pino at kde.org>
 //
 //========================================================================
diff --git a/utils/HtmlOutputDev.cc b/utils/HtmlOutputDev.cc
index 3926178..a3ae239 100644
--- a/utils/HtmlOutputDev.cc
+++ b/utils/HtmlOutputDev.cc
@@ -25,7 +25,7 @@
 // Copyright (C) 2009 Warren Toomey <wkt at tuhs.org>
 // Copyright (C) 2009, 2011 Carlos Garcia Campos <carlosgc at gnome.org>
 // Copyright (C) 2009 Reece Dunn <msclrhd at gmail.com>
-// Copyright (C) 2010, 2012 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2010, 2012, 2013 Adrian Johnson <ajohnson at redneon.com>
 // Copyright (C) 2010 Hib Eris <hib at hiberis.nl>
 // Copyright (C) 2010 OSSD CDAC Mumbai by Leena Chourey (leenac at cdacmumbai.in) and Onkar Potdar (onkar at cdacmumbai.in)
 // Copyright (C) 2011 Joshua Richardson <jric at chegg.com>
diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc
index 841c388..82618e9 100644
--- a/utils/pdftocairo.cc
+++ b/utils/pdftocairo.cc
@@ -19,7 +19,7 @@
 // Copyright (C) 2009 Shen Liang <shenzhuxi at gmail.com>
 // Copyright (C) 2009 Stefan Thomas <thomas at eload24.com>
 // Copyright (C) 2009, 2010 Albert Astals Cid <aacid at kde.org>
-// Copyright (C) 2010, 2011, 2012 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2010, 2011-2013 Adrian Johnson <ajohnson at redneon.com>
 // Copyright (C) 2010 Hib Eris <hib at hiberis.nl>
 // Copyright (C) 2010 Jonathan Liu <net147 at gmail.com>
 // Copyright (C) 2010 William Bader <williambader at hotmail.com>