[poppler] cpp/poppler-image.cpp goo/PNGWriter.cc poppler/MarkedContentOutputDev.cc poppler/MarkedContentOutputDev.h poppler/Object.h poppler/PDFDoc.h utils/ImageOutputDev.h

[Albert Astals Cid]

 cpp/poppler-image.cpp             |    1 +
 goo/PNGWriter.cc                  |    2 +-
 poppler/MarkedContentOutputDev.cc |    2 ++
 poppler/MarkedContentOutputDev.h  |    2 ++
 poppler/Object.h                  |    1 +
 poppler/PDFDoc.h                  |    1 +
 utils/ImageOutputDev.h            |    2 +-
 7 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 10a0c45676ef56bee5924e889a7e7c21244b4339
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Dec 10 20:48:36 2013 +0100

    Update copyrights

diff --git a/cpp/poppler-image.cpp b/cpp/poppler-image.cpp
index 18f9c79..23306df 100644
--- a/cpp/poppler-image.cpp
+++ b/cpp/poppler-image.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010-2011, Pino Toscano <pino at kde.org>
+ * Copyright (C) 2013 Adrian Johnson <ajohnson at redneon.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/goo/PNGWriter.cc b/goo/PNGWriter.cc
index 4370f28..c9d5199 100644
--- a/goo/PNGWriter.cc
+++ b/goo/PNGWriter.cc
@@ -8,7 +8,7 @@
 // Copyright (C) 2009 Shen Liang <shenzhuxi at gmail.com>
 // Copyright (C) 2009, 2011 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) 2011 Thomas Klausner <wiz at danbala.tuwien.ac.at>
 // Copyright (C) 2012 Pino Toscano <pino at kde.org>
 //
diff --git a/poppler/MarkedContentOutputDev.cc b/poppler/MarkedContentOutputDev.cc
index 78f2ea7..7fdd8f5 100644
--- a/poppler/MarkedContentOutputDev.cc
+++ b/poppler/MarkedContentOutputDev.cc
@@ -2,6 +2,8 @@
 //
 // MarkedContentOutputDev.cc
 //
+// This file is licensed under the GPLv2 or later
+//
 // Copyright 2013 Igalia S.L.
 //
 //========================================================================
diff --git a/poppler/MarkedContentOutputDev.h b/poppler/MarkedContentOutputDev.h
index 6decc9b..4ea60c2 100644
--- a/poppler/MarkedContentOutputDev.h
+++ b/poppler/MarkedContentOutputDev.h
@@ -2,6 +2,8 @@
 //
 // MarkedContentOutputDev.h
 //
+// This file is licensed under the GPLv2 or later
+//
 // Copyright 2013 Igalia S.L.
 //
 //========================================================================
diff --git a/poppler/Object.h b/poppler/Object.h
index 58125d5..a299624 100644
--- a/poppler/Object.h
+++ b/poppler/Object.h
@@ -20,6 +20,7 @@
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
 // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
 // Copyright (C) 2013 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2013 Adrian Perez de Castro <aperez at igalia.com>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
diff --git a/poppler/PDFDoc.h b/poppler/PDFDoc.h
index 48189bc..42c7cba 100644
--- a/poppler/PDFDoc.h
+++ b/poppler/PDFDoc.h
@@ -26,6 +26,7 @@
 // Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
 // Copyright (C) 2013 Adrian Johnson <ajohnson at redneon.com>
 // Copyright (C) 2013 Adam Reichold <adamreichold at myopera.com>
+// Copyright (C) 2013 Adrian Perez de Castro <aperez at igalia.com>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
diff --git a/utils/ImageOutputDev.h b/utils/ImageOutputDev.h
index 14918ea..a694bbc 100644
--- a/utils/ImageOutputDev.h
+++ b/utils/ImageOutputDev.h
@@ -17,7 +17,7 @@
 // Copyright (C) 2008 Timothy Lee <timothy.lee at siriushk.com>
 // Copyright (C) 2009 Carlos Garcia Campos <carlosgc at gnome.org>
 // Copyright (C) 2010 Jakob Voss <jakob.voss at gbv.de>
-// Copyright (C) 2012 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2012, 2013 Adrian Johnson <ajohnson at redneon.com>
 // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
 //
 // To see a description of the changes please see the Changelog file that