fofi/FoFiType1.cc | 1 + poppler/PDFDoc.cc | 4 ++-- poppler/PDFDoc.h | 2 +- poppler/XRef.cc | 2 +- qt4/src/poppler-annotation-private.h | 2 +- qt4/src/poppler-annotation.cc | 2 +- qt4/src/poppler-page.cc | 2 +- qt4/src/poppler-qt4.h | 2 +- qt5/src/poppler-annotation-private.h | 2 +- qt5/src/poppler-annotation.cc | 2 +- qt5/src/poppler-page.cc | 2 +- qt5/src/poppler-qt5.h | 2 +- utils/Makefile.am | 3 ++- utils/pdfdetach.cc | 1 + utils/pdftocairo-win32.cc | 12 ++++++++++++ utils/pdftocairo-win32.h | 12 ++++++++++++ utils/pdftocairo.cc | 3 ++- 17 files changed, 42 insertions(+), 14 deletions(-)
New commits: commit 0a9c38076f1555196029372b7e08714b43c7a58d Author: Albert Astals Cid <[email protected]> Date: Mon Nov 3 21:43:28 2014 +0100 Update (C) diff --git a/fofi/FoFiType1.cc b/fofi/FoFiType1.cc index 2245184..827ebc7 100644 --- a/fofi/FoFiType1.cc +++ b/fofi/FoFiType1.cc @@ -16,6 +16,7 @@ // Copyright (C) 2005, 2008, 2010 Albert Astals Cid <[email protected]> // Copyright (C) 2005 Kristian Høgsberg <[email protected]> // Copyright (C) 2010 Jakub Wilk <[email protected]> +// Copyright (C) 2014 Carlos Garcia Campos <[email protected]> // // 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.cc b/poppler/PDFDoc.cc index e88b8f6..04237fc 100644 --- a/poppler/PDFDoc.cc +++ b/poppler/PDFDoc.cc @@ -21,14 +21,14 @@ // Copyright (C) 2009 Eric Toombs <[email protected]> // Copyright (C) 2009 Kovid Goyal <[email protected]> // Copyright (C) 2009, 2011 Axel Struebing <[email protected]> -// Copyright (C) 2010-2012 Hib Eris <[email protected]> +// Copyright (C) 2010-2012, 2014 Hib Eris <[email protected]> // Copyright (C) 2010 Jakub Wilk <[email protected]> // Copyright (C) 2010 Ilya Gorenbein <[email protected]> // Copyright (C) 2010 Srinivas Adicherla <[email protected]> // Copyright (C) 2010 Philip Lorenz <[email protected]> // Copyright (C) 2011-2014 Thomas Freitag <[email protected]> // Copyright (C) 2012, 2013 Fabio D'Urso <[email protected]> -// Copyright (C) 2013 Adrian Johnson <[email protected]> +// Copyright (C) 2013, 2014 Adrian Johnson <[email protected]> // Copyright (C) 2013 Adam Reichold <[email protected]> // Copyright (C) 2014 Bogdan Cristea <[email protected]> // diff --git a/poppler/PDFDoc.h b/poppler/PDFDoc.h index bb72476..6c40f7b 100644 --- a/poppler/PDFDoc.h +++ b/poppler/PDFDoc.h @@ -20,7 +20,7 @@ // Copyright (C) 2008 Carlos Garcia Campos <[email protected]> // Copyright (C) 2009 Eric Toombs <[email protected]> // Copyright (C) 2009 Kovid Goyal <[email protected]> -// Copyright (C) 2010 Hib Eris <[email protected]> +// Copyright (C) 2010, 2014 Hib Eris <[email protected]> // Copyright (C) 2010 Srinivas Adicherla <[email protected]> // Copyright (C) 2011, 2013, 2014 Thomas Freitag <[email protected]> // Copyright (C) 2012 Fabio D'Urso <[email protected]> diff --git a/poppler/XRef.cc b/poppler/XRef.cc index 333f5ec..1bbbdc5 100644 --- a/poppler/XRef.cc +++ b/poppler/XRef.cc @@ -22,7 +22,7 @@ // Copyright (C) 2010 Hib Eris <[email protected]> // Copyright (C) 2012, 2013 Thomas Freitag <[email protected]> // Copyright (C) 2012, 2013 Fabio D'Urso <[email protected]> -// Copyright (C) 2013 Adrian Johnson <[email protected]> +// Copyright (C) 2013, 2014 Adrian Johnson <[email protected]> // Copyright (C) 2013 Pino Toscano <[email protected]> // // To see a description of the changes please see the Changelog file that diff --git a/qt4/src/poppler-annotation-private.h b/qt4/src/poppler-annotation-private.h index 4c263eb..b530e2f 100644 --- a/qt4/src/poppler-annotation-private.h +++ b/qt4/src/poppler-annotation-private.h @@ -2,7 +2,7 @@ * Copyright (C) 2007, Pino Toscano <[email protected]> * Copyright (C) 2012, Tobias Koenig <[email protected]> * Copyright (C) 2012, 2013 Fabio D'Urso <[email protected]> - * Copyright (C) 2012, Albert Astals Cid <[email protected]> + * Copyright (C) 2012, 2014, Albert Astals Cid <[email protected]> * * 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/qt4/src/poppler-annotation.cc b/qt4/src/poppler-annotation.cc index 8375287..364e9d0 100644 --- a/qt4/src/poppler-annotation.cc +++ b/qt4/src/poppler-annotation.cc @@ -1,5 +1,5 @@ /* poppler-annotation.cc: qt interface to poppler - * Copyright (C) 2006, 2009, 2012, 2013 Albert Astals Cid <[email protected]> + * Copyright (C) 2006, 2009, 2012-2014 Albert Astals Cid <[email protected]> * Copyright (C) 2006, 2008, 2010 Pino Toscano <[email protected]> * Copyright (C) 2012, Guillermo A. Amaral B. <[email protected]> * Copyright (C) 2012-2014 Fabio D'Urso <[email protected]> diff --git a/qt4/src/poppler-page.cc b/qt4/src/poppler-page.cc index 32f6d7e..fc928b9 100644 --- a/qt4/src/poppler-page.cc +++ b/qt4/src/poppler-page.cc @@ -1,7 +1,7 @@ /* poppler-page.cc: qt interface to poppler * Copyright (C) 2005, Net Integration Technologies, Inc. * Copyright (C) 2005, Brad Hards <[email protected]> - * Copyright (C) 2005-2013, Albert Astals Cid <[email protected]> + * Copyright (C) 2005-2014, Albert Astals Cid <[email protected]> * Copyright (C) 2005, Stefan Kebekus <[email protected]> * Copyright (C) 2006-2011, Pino Toscano <[email protected]> * Copyright (C) 2008 Carlos Garcia Campos <[email protected]> diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h index 6c4a410..ee7558e 100644 --- a/qt4/src/poppler-qt4.h +++ b/qt4/src/poppler-qt4.h @@ -1,7 +1,7 @@ /* poppler-qt.h: qt interface to poppler * Copyright (C) 2005, Net Integration Technologies, Inc. * Copyright (C) 2005, 2007, Brad Hards <[email protected]> - * Copyright (C) 2005-2012, Albert Astals Cid <[email protected]> + * Copyright (C) 2005-2012, 2014, Albert Astals Cid <[email protected]> * Copyright (C) 2005, Stefan Kebekus <[email protected]> * Copyright (C) 2006-2011, Pino Toscano <[email protected]> * Copyright (C) 2009 Shawn Rutledge <[email protected]> diff --git a/qt5/src/poppler-annotation-private.h b/qt5/src/poppler-annotation-private.h index 4c263eb..b530e2f 100644 --- a/qt5/src/poppler-annotation-private.h +++ b/qt5/src/poppler-annotation-private.h @@ -2,7 +2,7 @@ * Copyright (C) 2007, Pino Toscano <[email protected]> * Copyright (C) 2012, Tobias Koenig <[email protected]> * Copyright (C) 2012, 2013 Fabio D'Urso <[email protected]> - * Copyright (C) 2012, Albert Astals Cid <[email protected]> + * Copyright (C) 2012, 2014, Albert Astals Cid <[email protected]> * * 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/qt5/src/poppler-annotation.cc b/qt5/src/poppler-annotation.cc index 3654cb3..57e8e74 100644 --- a/qt5/src/poppler-annotation.cc +++ b/qt5/src/poppler-annotation.cc @@ -1,5 +1,5 @@ /* poppler-annotation.cc: qt interface to poppler - * Copyright (C) 2006, 2009, 2012, 2013 Albert Astals Cid <[email protected]> + * Copyright (C) 2006, 2009, 2012-2014 Albert Astals Cid <[email protected]> * Copyright (C) 2006, 2008, 2010 Pino Toscano <[email protected]> * Copyright (C) 2012, Guillermo A. Amaral B. <[email protected]> * Copyright (C) 2012-2014 Fabio D'Urso <[email protected]> diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc index 2977214..6eea0d0 100644 --- a/qt5/src/poppler-page.cc +++ b/qt5/src/poppler-page.cc @@ -1,7 +1,7 @@ /* poppler-page.cc: qt interface to poppler * Copyright (C) 2005, Net Integration Technologies, Inc. * Copyright (C) 2005, Brad Hards <[email protected]> - * Copyright (C) 2005-2013, Albert Astals Cid <[email protected]> + * Copyright (C) 2005-2014, Albert Astals Cid <[email protected]> * Copyright (C) 2005, Stefan Kebekus <[email protected]> * Copyright (C) 2006-2011, Pino Toscano <[email protected]> * Copyright (C) 2008 Carlos Garcia Campos <[email protected]> diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h index d8f13ea..dee0b19 100644 --- a/qt5/src/poppler-qt5.h +++ b/qt5/src/poppler-qt5.h @@ -1,7 +1,7 @@ /* poppler-qt.h: qt interface to poppler * Copyright (C) 2005, Net Integration Technologies, Inc. * Copyright (C) 2005, 2007, Brad Hards <[email protected]> - * Copyright (C) 2005-2013, Albert Astals Cid <[email protected]> + * Copyright (C) 2005-2014, Albert Astals Cid <[email protected]> * Copyright (C) 2005, Stefan Kebekus <[email protected]> * Copyright (C) 2006-2011, Pino Toscano <[email protected]> * Copyright (C) 2009 Shawn Rutledge <[email protected]> diff --git a/utils/pdfdetach.cc b/utils/pdfdetach.cc index 3bae3c0..5bbdc1e 100644 --- a/utils/pdfdetach.cc +++ b/utils/pdfdetach.cc @@ -15,6 +15,7 @@ // // Copyright (C) 2011 Carlos Garcia Campos <[email protected]> // Copyright (C) 2013 Yury G. Kudryashov <[email protected]> +// Copyright (C) 2014 Adrian Johnson <[email protected]> // // 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/pdftocairo-win32.cc b/utils/pdftocairo-win32.cc index 565d8a1..bf2eac2 100644 --- a/utils/pdftocairo-win32.cc +++ b/utils/pdftocairo-win32.cc @@ -1,3 +1,15 @@ +//======================================================================== +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2014 Rodrigo Rivas Costa <[email protected]> +// Copyright (C) 2014 Adrian Johnson <[email protected]> +// +// 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 +// +//======================================================================== + #include <cairo.h> #ifdef CAIRO_HAS_WIN32_SURFACE diff --git a/utils/pdftocairo-win32.h b/utils/pdftocairo-win32.h index fe2cf4d..202b864 100644 --- a/utils/pdftocairo-win32.h +++ b/utils/pdftocairo-win32.h @@ -1,3 +1,15 @@ +//======================================================================== +// +// This file is licensed under the GPLv2 or later +// +// Copyright (C) 2014 Rodrigo Rivas Costa <[email protected]> +// Copyright (C) 2014 Adrian Johnson <[email protected]> +// +// 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 +// +//======================================================================== + #include <cairo.h> #include "goo/gmem.h" #include "goo/gtypes.h" diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc index 13e1c63..18fade4 100644 --- a/utils/pdftocairo.cc +++ b/utils/pdftocairo.cc @@ -20,7 +20,7 @@ // Copyright (C) 2009 Stefan Thomas <[email protected]> // Copyright (C) 2009, 2010 Albert Astals Cid <[email protected]> // Copyright (C) 2010, 2011-2014 Adrian Johnson <[email protected]> -// Copyright (C) 2010 Hib Eris <[email protected]> +// Copyright (C) 2010, 2014 Hib Eris <[email protected]> // Copyright (C) 2010 Jonathan Liu <[email protected]> // Copyright (C) 2010 William Bader <[email protected]> // Copyright (C) 2011 Thomas Freitag <[email protected]> @@ -28,6 +28,7 @@ // Copyright (C) 2012 Koji Otani <[email protected]> // Copyright (C) 2013 Lu Wang <[email protected]> // Copyright (C) 2013 Suzuki Toshiya <[email protected]> +// Copyright (C) 2014 Rodrigo Rivas Costa <[email protected]> // // 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 commit 73cf1e87c9803bbe4271be297b486d9932677d46 Author: Albert Astals Cid <[email protected]> Date: Mon Nov 3 21:37:13 2014 +0100 Need to dist this file diff --git a/utils/Makefile.am b/utils/Makefile.am index 7a5ab4d..376d021 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -108,7 +108,8 @@ pdftoppm_SOURCES = \ pdftocairo_SOURCES = \ pdftocairo.cc \ - pdftocairo-win32.cc + pdftocairo-win32.cc \ + pdftocairo-win32.h if BUILD_CAIRO_OUTPUT if USE_CMS
_______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
