CMakeLists.txt | 10 +++++++--- NEWS | 20 ++++++++++++++++++++ cpp/CMakeLists.txt | 4 ++++ cpp/Doxyfile | 2 +- fofi/FoFiTrueType.cc | 2 +- glib/CMakeLists.txt | 4 ++++ goo/FixedPoint.cc | 14 ++++++++++++++ goo/FixedPoint.h | 15 +++++++++++++++ goo/GooMutex.h | 1 + goo/GooString.cc | 2 +- goo/GooString.h | 1 + goo/gfile.cc | 2 +- goo/gfile.h | 2 +- goo/glibc.h | 2 +- goo/glibc_strtok_r.cc | 1 + poppler/Annot.cc | 2 +- poppler/Annot.h | 2 +- poppler/Array.cc | 1 + poppler/Array.h | 1 + poppler/CMap.cc | 1 + poppler/CMap.h | 2 +- poppler/CairoFontEngine.cc | 2 +- poppler/CairoFontEngine.h | 2 +- poppler/CairoRescaleBox.cc | 2 +- poppler/Catalog.cc | 2 +- poppler/Catalog.h | 2 +- poppler/CharCodeToUnicode.cc | 2 +- poppler/CharCodeToUnicode.h | 1 + poppler/DCTStream.cc | 1 + poppler/Decrypt.cc | 2 +- poppler/Dict.cc | 1 + poppler/Dict.h | 1 + poppler/FlateEncoder.cc | 1 + poppler/FlateStream.cc | 1 + poppler/GlobalParams.cc | 2 +- poppler/GlobalParams.h | 2 +- poppler/GlobalParamsWin.cc | 2 +- poppler/Object.h | 2 +- poppler/OutputDev.cc | 2 +- poppler/OutputDev.h | 2 +- poppler/PDFDoc.cc | 2 +- poppler/PDFDoc.h | 2 +- poppler/PDFDocFactory.cc | 1 + poppler/PSOutputDev.cc | 2 +- poppler/PSOutputDev.h | 2 +- poppler/Page.cc | 2 +- poppler/Page.h | 2 +- poppler/SplashOutputDev.cc | 2 +- poppler/SplashOutputDev.h | 2 +- poppler/StructTreeRoot.cc | 1 + poppler/TextOutputDev.cc | 2 +- poppler/TextOutputDev.h | 2 +- poppler/UnicodeMap.cc | 1 + poppler/UnicodeMap.h | 14 ++++++++++++++ poppler/XRef.cc | 2 +- poppler/XRef.h | 2 +- poppler/poppler-config.h.cmake | 1 + qt4/src/ArthurOutputDev.cc | 1 + qt4/src/CMakeLists.txt | 4 ++++ qt4/src/Doxyfile | 2 +- qt4/src/poppler-document.cc | 1 + qt4/src/poppler-page.cc | 1 + qt5/src/ArthurOutputDev.cc | 1 + qt5/src/CMakeLists.txt | 4 ++++ qt5/src/Doxyfile | 2 +- qt5/src/poppler-document.cc | 1 + qt5/src/poppler-page.cc | 1 + splash/Splash.cc | 2 +- splash/Splash.h | 2 +- splash/SplashFTFont.cc | 1 + splash/SplashFTFont.h | 1 + splash/SplashFTFontEngine.cc | 1 + splash/SplashFTFontEngine.h | 1 + splash/SplashFTFontFile.cc | 2 +- splash/SplashFTFontFile.h | 1 + splash/SplashFontEngine.cc | 1 + splash/SplashFontEngine.h | 1 + splash/SplashMath.h | 1 + splash/SplashState.cc | 1 + splash/SplashState.h | 1 + splash/SplashTypes.h | 1 + splash/SplashXPath.cc | 1 + utils/pdfimages.cc | 2 +- utils/pdftocairo-win32.cc | 2 +- utils/pdftoppm.cc | 2 +- utils/pdftops.cc | 2 +- 86 files changed, 163 insertions(+), 46 deletions(-)
New commits: commit aaa9c5308766a88d0512b87051d7c7082f152a9f Author: Albert Astals Cid <[email protected]> Date: Fri Nov 3 11:25:02 2017 +0100 Poppler 0.61 diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b0b9126..bb74c6a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,8 +30,8 @@ if (ECM_FOUND) endif() set(POPPLER_MAJOR_VERSION "0") -set(POPPLER_MINOR_VERSION "60") -set(POPPLER_MICRO_VERSION "1") +set(POPPLER_MINOR_VERSION "61") +set(POPPLER_MICRO_VERSION "0") set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}") set (CMAKE_CXX_STANDARD 11) @@ -544,7 +544,7 @@ add_library(poppler STATIC ${poppler_SRCS}) else() add_library(poppler ${poppler_SRCS}) endif() -set_target_properties(poppler PROPERTIES VERSION 71.0.0 SOVERSION 71) +set_target_properties(poppler PROPERTIES VERSION 72.0.0 SOVERSION 72) if(MINGW) get_target_property(POPPLER_SOVERSION poppler SOVERSION) set_target_properties(poppler PROPERTIES SUFFIX "-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") diff --git a/NEWS b/NEWS index 018088ad..7211de13 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,23 @@ +Release 0.61.0 + core: + * Fix crashes in broken files + * Cleanup unused functions from GlobalParams + * Tweak LZWStream::processNextCode error handling. Bug #103174 + * Warning fixes + * Remove t1lib code + + qt5: + * Clean up the remaining Splash code in Arthur backend. Bug #103117 + * ArthurOutputDev: Properly implement saveState/restoreState. Bug #103118 + * Fix leak in ArthurOutputDev::updateFont. Bug #103508 + + build system: + * Use GNUInstallDirs. Bug #103211 + * mingw: Install pkg-config files + * mingw: change library names to include the soversion. Bug #103157 + * Fix installing a .cc file as header + * Use -pthread flag instead of -lpthread + Release 0.60.1 qt5: * ArthurOutputDev: Add missing 'return' in error paths diff --git a/cpp/Doxyfile b/cpp/Doxyfile index dde54a46..c1a05c0c 100644 --- a/cpp/Doxyfile +++ b/cpp/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler CPP" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.60.1 +PROJECT_NUMBER = 0.61.0 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/qt4/src/Doxyfile b/qt4/src/Doxyfile index a38057b8..9c46f272 100644 --- a/qt4/src/Doxyfile +++ b/qt4/src/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler Qt4 " # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.60.1 +PROJECT_NUMBER = 0.61.0 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/qt5/src/Doxyfile b/qt5/src/Doxyfile index 6fa59360..06975f03 100644 --- a/qt5/src/Doxyfile +++ b/qt5/src/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = "Poppler Qt5" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.60.1 +PROJECT_NUMBER = 0.61.0 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. commit 79b704b4017cf66dc3c39b49425c8b02760e5165 Author: Albert Astals Cid <[email protected]> Date: Fri Nov 3 11:14:10 2017 +0100 Update (C) for commits since last release diff --git a/fofi/FoFiTrueType.cc b/fofi/FoFiTrueType.cc index 83a6b84b..2bbf0468 100644 --- a/fofi/FoFiTrueType.cc +++ b/fofi/FoFiTrueType.cc @@ -19,7 +19,7 @@ // Copyright (C) 2008, 2009, 2012, 2014-2017 Albert Astals Cid <[email protected]> // Copyright (C) 2008 Tomas Are Haavet <[email protected]> // Copyright (C) 2012 Suzuki Toshiya <[email protected]> -// Copyright (C) 2012 Adrian Johnson <[email protected]> +// Copyright (C) 2012, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2014 Thomas Freitag <[email protected]> // Copyright (C) 2015 Aleksei Volkov <Aleksei Volkov> // Copyright (C) 2015, 2016 William Bader <[email protected]> diff --git a/goo/FixedPoint.cc b/goo/FixedPoint.cc index 8a510105..b51446bf 100644 --- a/goo/FixedPoint.cc +++ b/goo/FixedPoint.cc @@ -8,6 +8,20 @@ // //======================================================================== +//======================================================================== +// +// Modified under the Poppler project - http://poppler.freedesktop.org +// +// All changes made under the Poppler project to this file are licensed +// under GPL version 2 or later +// +// Copyright (C) 2017 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 <config.h> #ifdef USE_FIXEDPOINT diff --git a/goo/FixedPoint.h b/goo/FixedPoint.h index 47110595..408dfc6f 100644 --- a/goo/FixedPoint.h +++ b/goo/FixedPoint.h @@ -8,6 +8,21 @@ // //======================================================================== + +//======================================================================== +// +// Modified under the Poppler project - http://poppler.freedesktop.org +// +// All changes made under the Poppler project to this file are licensed +// under GPL version 2 or later +// +// Copyright (C) 2017 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 +// +//======================================================================== + #ifndef FIXEDPOINT_H #define FIXEDPOINT_H diff --git a/goo/GooMutex.h b/goo/GooMutex.h index 9736234e..68dabc40 100644 --- a/goo/GooMutex.h +++ b/goo/GooMutex.h @@ -21,6 +21,7 @@ // Copyright (C) 2013 Adam Reichold <[email protected]> // Copyright (C) 2014 Bogdan Cristea <[email protected]> // Copyright (C) 2014 Peter Breitenlohner <[email protected]> +// Copyright (C) 2017 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/goo/GooString.cc b/goo/GooString.cc index ef7676c8..e23c2b76 100644 --- a/goo/GooString.cc +++ b/goo/GooString.cc @@ -21,7 +21,7 @@ // Copyright (C) 2008-2011, 2016, 2017 Albert Astals Cid <[email protected]> // Copyright (C) 2011 Kenji Uno <[email protected]> // Copyright (C) 2012, 2013 Fabio D'Urso <[email protected]> -// Copyright (C) 2012 Adrian Johnson <[email protected]> +// Copyright (C) 2012, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2012 Pino Toscano <[email protected]> // Copyright (C) 2013 Jason Crain <[email protected]> // Copyright (C) 2015 William Bader <[email protected]> diff --git a/goo/GooString.h b/goo/GooString.h index 2caf9e79..49f2888e 100644 --- a/goo/GooString.h +++ b/goo/GooString.h @@ -22,6 +22,7 @@ // Copyright (C) 2013 Jason Crain <[email protected]> // Copyright (C) 2015 Adam Reichold <[email protected]> // Copyright (C) 2016 Jakub Alba <[email protected]> +// Copyright (C) 2017 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/goo/gfile.cc b/goo/gfile.cc index 09136303..fe05de67 100644 --- a/goo/gfile.cc +++ b/goo/gfile.cc @@ -22,7 +22,7 @@ // Copyright (C) 2009, 2012, 2014 Albert Astals Cid <[email protected]> // Copyright (C) 2009 Kovid Goyal <[email protected]> // Copyright (C) 2013 Adam Reichold <[email protected]> -// Copyright (C) 2013 Adrian Johnson <[email protected]> +// Copyright (C) 2013, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2013 Peter Breitenlohner <[email protected]> // Copyright (C) 2013 Thomas Freitag <[email protected]> // Copyright (C) 2017 Christoph Cullmann <[email protected]> diff --git a/goo/gfile.h b/goo/gfile.h index 9e0612f6..805e5232 100644 --- a/goo/gfile.h +++ b/goo/gfile.h @@ -19,7 +19,7 @@ // Copyright (C) 2009, 2011, 2012 Albert Astals Cid <[email protected]> // Copyright (C) 2009 Kovid Goyal <[email protected]> // Copyright (C) 2013 Adam Reichold <[email protected]> -// Copyright (C) 2013 Adrian Johnson <[email protected]> +// Copyright (C) 2013, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2014 Bogdan Cristea <[email protected]> // Copyright (C) 2014 Peter Breitenlohner <[email protected]> // Copyright (C) 2017 Christoph Cullmann <[email protected]> diff --git a/goo/glibc.h b/goo/glibc.h index 375f70dc..8b372bca 100644 --- a/goo/glibc.h +++ b/goo/glibc.h @@ -6,7 +6,7 @@ // // This file is licensed under the GPLv2 or later // -// Copyright (C) 2016 Adrian Johnson <[email protected]> +// Copyright (C) 2016, 2017 Adrian Johnson <[email protected]> // //======================================================================== diff --git a/goo/glibc_strtok_r.cc b/goo/glibc_strtok_r.cc index 9952e45b..e779bf50 100644 --- a/goo/glibc_strtok_r.cc +++ b/goo/glibc_strtok_r.cc @@ -49,6 +49,7 @@ // // Copyright (C) 2012 Alexey Pavlov <[email protected]> // Copyright (C) 2012 Albert Astals Cid <[email protected]> +// Copyright (C) 2017 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/poppler/Annot.cc b/poppler/Annot.cc index 7b0f8cdf..7f249d5a 100644 --- a/poppler/Annot.cc +++ b/poppler/Annot.cc @@ -28,7 +28,7 @@ // Copyright (C) 2012, 2013 Thomas Freitag <[email protected]> // Copyright (C) 2012, 2015 Tobias Koenig <[email protected]> // Copyright (C) 2013 Peter Breitenlohner <[email protected]> -// Copyright (C) 2013 Adrian Johnson <[email protected]> +// Copyright (C) 2013, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2014, 2015 Marek Kasik <[email protected]> // Copyright (C) 2014 Jiri Slaby <[email protected]> // Copyright (C) 2014 Anuj Khare <[email protected]> diff --git a/poppler/Annot.h b/poppler/Annot.h index fa5d2064..82279bdf 100644 --- a/poppler/Annot.h +++ b/poppler/Annot.h @@ -25,7 +25,7 @@ // Copyright (C) 2012, 2013 Fabio D'Urso <[email protected]> // Copyright (C) 2012, 2015 Tobias Koenig <[email protected]> // Copyright (C) 2013 Thomas Freitag <[email protected]> -// Copyright (C) 2013 Adrian Johnson <[email protected]> +// Copyright (C) 2013, 2017 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/poppler/Array.cc b/poppler/Array.cc index ed8f58d1..c6de53ef 100644 --- a/poppler/Array.cc +++ b/poppler/Array.cc @@ -17,6 +17,7 @@ // Copyright (C) 2012 Fabio D'Urso <[email protected]> // Copyright (C) 2013 Thomas Freitag <[email protected]> // Copyright (C) 2013, 2017 Albert Astals Cid <[email protected]> +// Copyright (C) 2017 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/poppler/Array.h b/poppler/Array.h index 2e7c3800..2babc8be 100644 --- a/poppler/Array.h +++ b/poppler/Array.h @@ -17,6 +17,7 @@ // Copyright (C) 2012 Fabio D'Urso <[email protected]> // Copyright (C) 2013 Thomas Freitag <[email protected]> // Copyright (C) 2017 Albert Astals Cid <[email protected]> +// Copyright (C) 2017 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/poppler/CMap.cc b/poppler/CMap.cc index a9e0482f..2d2a7d75 100644 --- a/poppler/CMap.cc +++ b/poppler/CMap.cc @@ -16,6 +16,7 @@ // Copyright (C) 2008 Koji Otani <[email protected]> // Copyright (C) 2008, 2009, 2017 Albert Astals Cid <[email protected]> // Copyright (C) 2013 Fabio D'Urso <[email protected]> +// Copyright (C) 2017 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/poppler/CMap.h b/poppler/CMap.h index 52820933..e85c086a 100644 --- a/poppler/CMap.h +++ b/poppler/CMap.h @@ -15,7 +15,7 @@ // // Copyright (C) 2008 Koji Otani <[email protected]> // Copyright (C) 2009 Albert Astals Cid <[email protected]> -// Copyright (C) 2012 Adrian Johnson <[email protected]> +// Copyright (C) 2012, 2017 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/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc index 742a81e7..a375e0af 100644 --- a/poppler/CairoFontEngine.cc +++ b/poppler/CairoFontEngine.cc @@ -21,7 +21,7 @@ // Copyright (C) 2006, 2007, 2010, 2011 Carlos Garcia Campos <[email protected]> // Copyright (C) 2007 Koji Otani <[email protected]> // Copyright (C) 2008, 2009 Chris Wilson <[email protected]> -// Copyright (C) 2008, 2012, 2014, 2016 Adrian Johnson <[email protected]> +// Copyright (C) 2008, 2012, 2014, 2016, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2009 Darren Kenny <[email protected]> // Copyright (C) 2010 Suzuki Toshiya <[email protected]> // Copyright (C) 2010 Jan Kümmel <[email protected]> diff --git a/poppler/CairoFontEngine.h b/poppler/CairoFontEngine.h index 25566a85..12fa598f 100644 --- a/poppler/CairoFontEngine.h +++ b/poppler/CairoFontEngine.h @@ -18,7 +18,7 @@ // Copyright (C) 2005 Albert Astals Cid <[email protected]> // Copyright (C) 2006, 2007 Jeff Muizelaar <[email protected]> // Copyright (C) 2006, 2010 Carlos Garcia Campos <[email protected]> -// Copyright (C) 2008 Adrian Johnson <[email protected]> +// Copyright (C) 2008, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2013 Thomas Freitag <[email protected]> // // To see a description of the changes please see the Changelog file that diff --git a/poppler/CairoRescaleBox.cc b/poppler/CairoRescaleBox.cc index 391466ab..aa9e9e7d 100644 --- a/poppler/CairoRescaleBox.cc +++ b/poppler/CairoRescaleBox.cc @@ -31,7 +31,7 @@ // under GPL version 2 or later // // Copyright (C) 2012 Hib Eris <[email protected]> -// Copyright (C) 2012 Adrian Johnson <[email protected]> +// Copyright (C) 2012, 2017 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/poppler/Catalog.cc b/poppler/Catalog.cc index 80cfa40e..eebbbb42 100644 --- a/poppler/Catalog.cc +++ b/poppler/Catalog.cc @@ -28,7 +28,7 @@ // Copyright (C) 2013 Thomas Freitag <[email protected]> // Copyright (C) 2013 Julien Nabet <[email protected]> // Copyright (C) 2013 Adrian Perez de Castro <[email protected]> -// Copyright (C) 2013 Adrian Johnson <[email protected]> +// Copyright (C) 2013, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2013 José Aliste <[email protected]> // Copyright (C) 2014 Ed Porras <[email protected]> // Copyright (C) 2015 Even Rouault <[email protected]> diff --git a/poppler/Catalog.h b/poppler/Catalog.h index 18f07458..a2dd7fde 100644 --- a/poppler/Catalog.h +++ b/poppler/Catalog.h @@ -23,7 +23,7 @@ // Copyright (C) 2012 Fabio D'Urso <[email protected]> // Copyright (C) 2013 Thomas Freitag <[email protected]> // Copyright (C) 2013 Adrian Perez de Castro <[email protected]> -// Copyright (C) 2013 Adrian Johnson <[email protected]> +// Copyright (C) 2013, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2013 José Aliste <[email protected]> // Copyright (C) 2016 Masamichi Hosoda <[email protected]> // diff --git a/poppler/CharCodeToUnicode.cc b/poppler/CharCodeToUnicode.cc index 0dfbceab..10464547 100644 --- a/poppler/CharCodeToUnicode.cc +++ b/poppler/CharCodeToUnicode.cc @@ -21,7 +21,7 @@ // Copyright (C) 2010 William Bader <[email protected]> // Copyright (C) 2010 Jakub Wilk <[email protected]> // Copyright (C) 2012 Thomas Freitag <[email protected]> -// Copyright (C) 2012 Adrian Johnson <[email protected]> +// Copyright (C) 2012, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2014 Jiri Slaby <[email protected]> // Copyright (C) 2015 Marek Kasik <[email protected]> // diff --git a/poppler/CharCodeToUnicode.h b/poppler/CharCodeToUnicode.h index e8f8e774..e2b12ae3 100644 --- a/poppler/CharCodeToUnicode.h +++ b/poppler/CharCodeToUnicode.h @@ -18,6 +18,7 @@ // Copyright (C) 2007 Julien Rebetez <[email protected]> // Copyright (C) 2007 Koji Otani <[email protected]> // Copyright (C) 2008, 2011, 2012 Albert Astals Cid <[email protected]> +// Copyright (C) 2017 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/poppler/DCTStream.cc b/poppler/DCTStream.cc index 938e18a6..7a4d5930 100644 --- a/poppler/DCTStream.cc +++ b/poppler/DCTStream.cc @@ -11,6 +11,7 @@ // Copyright 2011 Daiki Ueno <[email protected]> // Copyright 2011 Tomas Hoger <[email protected]> // Copyright 2012, 2013 Thomas Freitag <[email protected]> +// Copyright 2017 Adrian Johnson <[email protected]> // //======================================================================== diff --git a/poppler/Decrypt.cc b/poppler/Decrypt.cc index 65a2b572..db755812 100644 --- a/poppler/Decrypt.cc +++ b/poppler/Decrypt.cc @@ -18,7 +18,7 @@ // Copyright (C) 2009 Matthias Franz <[email protected]> // Copyright (C) 2009 David Benjamin <[email protected]> // Copyright (C) 2012 Fabio D'Urso <[email protected]> -// Copyright (C) 2013 Adrian Johnson <[email protected]> +// Copyright (C) 2013, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2016 Alok Anand <[email protected]> // Copyright (C) 2016 Thomas Freitag <[email protected]> // diff --git a/poppler/Dict.cc b/poppler/Dict.cc index 5bc01818..89814708 100644 --- a/poppler/Dict.cc +++ b/poppler/Dict.cc @@ -21,6 +21,7 @@ // Copyright (C) 2012 Fabio D'Urso <[email protected]> // Copyright (C) 2013 Thomas Freitag <[email protected]> // Copyright (C) 2014 Scott West <[email protected]> +// Copyright (C) 2017 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/poppler/Dict.h b/poppler/Dict.h index 553bfa5b..328f422c 100644 --- a/poppler/Dict.h +++ b/poppler/Dict.h @@ -19,6 +19,7 @@ // Copyright (C) 2010, 2017 Albert Astals Cid <[email protected]> // Copyright (C) 2010 PaweÅ Wiejacha <[email protected]> // Copyright (C) 2013 Thomas Freitag <[email protected]> +// Copyright (C) 2017 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/poppler/FlateEncoder.cc b/poppler/FlateEncoder.cc index def50a04..c6e4a042 100644 --- a/poppler/FlateEncoder.cc +++ b/poppler/FlateEncoder.cc @@ -3,6 +3,7 @@ // FlateEncoder.cc // // Copyright (C) 2016, William Bader <[email protected]> +// Copyright (C) 2017 Adrian Johnson <[email protected]> // // This file is under the GPLv2 or later license // diff --git a/poppler/FlateStream.cc b/poppler/FlateStream.cc index 8f9daf31..d23435ff 100644 --- a/poppler/FlateStream.cc +++ b/poppler/FlateStream.cc @@ -5,6 +5,7 @@ // Copyright (C) 2005, Jeff Muizelaar <[email protected]> // Copyright (C) 2010, Albert Astals Cid <[email protected]> // Copyright (C) 2016, William Bader <[email protected]> +// Copyright (C) 2017, Adrian Johnson <[email protected]> // // This file is under the GPLv2 or later license // diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc index 31a9957c..26669930 100644 --- a/poppler/GlobalParams.cc +++ b/poppler/GlobalParams.cc @@ -31,7 +31,7 @@ // Copyright (C) 2011 Pino Toscano <[email protected]> // Copyright (C) 2011 Koji Otani <[email protected]> // Copyright (C) 2012 Yi Yang <[email protected]> -// Copyright (C) 2012 Adrian Johnson <[email protected]> +// Copyright (C) 2012, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2012 Thomas Freitag <[email protected]> // Copyright (C) 2012 Peter Breitenlohner <[email protected]> // Copyright (C) 2013, 2014 Jason Crain <[email protected]> diff --git a/poppler/GlobalParams.h b/poppler/GlobalParams.h index 11c3211a..7c61ae44 100644 --- a/poppler/GlobalParams.h +++ b/poppler/GlobalParams.h @@ -23,7 +23,7 @@ // Copyright (C) 2009, 2011, 2012, 2014, 2015 William Bader <[email protected]> // Copyright (C) 2010 Hib Eris <[email protected]> // Copyright (C) 2011 Pino Toscano <[email protected]> -// Copyright (C) 2012 Adrian Johnson <[email protected]> +// Copyright (C) 2012, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2012 Thomas Freitag <[email protected]> // Copyright (C) 2013 Jason Crain <[email protected]> // diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc index df99681c..f122fcb6 100644 --- a/poppler/GlobalParamsWin.cc +++ b/poppler/GlobalParamsWin.cc @@ -4,7 +4,7 @@ // Copyright (C) 2010, 2012 Hib Eris <[email protected]> // Copyright (C) 2012, 2013 Thomas Freitag <[email protected]> // Copyright (C) 2012 Suzuki Toshiya <[email protected]> - // Copyright (C) 2012 Adrian Johnson <[email protected]> + // Copyright (C) 2012, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2012 Mark Brand <[email protected]> // Copyright (C) 2013 Adam Reichold <[email protected]> // Copyright (C) 2013 Dmytro Morgun <[email protected]> diff --git a/poppler/Object.h b/poppler/Object.h index 7e734615..f2ca20d1 100644 --- a/poppler/Object.h +++ b/poppler/Object.h @@ -19,7 +19,7 @@ // Copyright (C) 2009 Jakub Wilk <[email protected]> // Copyright (C) 2012 Fabio D'Urso <[email protected]> // Copyright (C) 2013 Thomas Freitag <[email protected]> -// Copyright (C) 2013 Adrian Johnson <[email protected]> +// Copyright (C) 2013, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2013 Adrian Perez de Castro <[email protected]> // Copyright (C) 2016 Jakub Alba <[email protected]> // diff --git a/poppler/OutputDev.cc b/poppler/OutputDev.cc index ace9c016..0acdcbde 100644 --- a/poppler/OutputDev.cc +++ b/poppler/OutputDev.cc @@ -15,7 +15,7 @@ // // Copyright (C) 2005 Jonathan Blandford <[email protected]> // Copyright (C) 2006 Thorkild Stray <[email protected]> -// Copyright (C) 2007 Adrian Johnson <[email protected]> +// Copyright (C) 2007, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2009 Carlos Garcia Campos <[email protected]> // Copyright (C) 2009, 2012, 2013 Albert Astals Cid <[email protected]> // Copyright (C) 2012 Thomas Freitag <[email protected]> diff --git a/poppler/OutputDev.h b/poppler/OutputDev.h index b6645acc..107c94d2 100644 --- a/poppler/OutputDev.h +++ b/poppler/OutputDev.h @@ -16,7 +16,7 @@ // Copyright (C) 2005 Jonathan Blandford <[email protected]> // Copyright (C) 2006 Thorkild Stray <[email protected]> // Copyright (C) 2007 Jeff Muizelaar <[email protected]> -// Copyright (C) 2007, 2011 Adrian Johnson <[email protected]> +// Copyright (C) 2007, 2011, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2009-2013, 2015 Thomas Freitag <[email protected]> // Copyright (C) 2009, 2011 Carlos Garcia Campos <[email protected]> // Copyright (C) 2009, 2012, 2013 Albert Astals Cid <[email protected]> diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc index 50a5163c..a2468a5f 100644 --- a/poppler/PDFDoc.cc +++ b/poppler/PDFDoc.cc @@ -28,7 +28,7 @@ // Copyright (C) 2010 Philip Lorenz <[email protected]> // Copyright (C) 2011-2016 Thomas Freitag <[email protected]> // Copyright (C) 2012, 2013 Fabio D'Urso <[email protected]> -// Copyright (C) 2013, 2014 Adrian Johnson <[email protected]> +// Copyright (C) 2013, 2014, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2013 Adam Reichold <[email protected]> // Copyright (C) 2014 Bogdan Cristea <[email protected]> // Copyright (C) 2015 Li Junling <[email protected]> diff --git a/poppler/PDFDoc.h b/poppler/PDFDoc.h index 624177f5..48d8dcf7 100644 --- a/poppler/PDFDoc.h +++ b/poppler/PDFDoc.h @@ -24,7 +24,7 @@ // Copyright (C) 2010 Srinivas Adicherla <[email protected]> // Copyright (C) 2011, 2013, 2014, 2016 Thomas Freitag <[email protected]> // Copyright (C) 2012 Fabio D'Urso <[email protected]> -// Copyright (C) 2013 Adrian Johnson <[email protected]> +// Copyright (C) 2013, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2013 Adam Reichold <[email protected]> // Copyright (C) 2013 Adrian Perez de Castro <[email protected]> // Copyright (C) 2015 André Guerreiro <[email protected]> diff --git a/poppler/PDFDocFactory.cc b/poppler/PDFDocFactory.cc index 59b1b9fa..cbd1395f 100644 --- a/poppler/PDFDocFactory.cc +++ b/poppler/PDFDocFactory.cc @@ -6,6 +6,7 @@ // // Copyright 2010 Hib Eris <[email protected]> // Copyright 2010 Albert Astals Cid <[email protected]> +// Copyright 2017 Adrian Johnson <[email protected]> // //======================================================================== diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc index bdb328fb..ac4f028f 100644 --- a/poppler/PSOutputDev.cc +++ b/poppler/PSOutputDev.cc @@ -25,7 +25,7 @@ // Copyright (C) 2009 Carlos Garcia Campos <[email protected]> // Copyright (C) 2009, 2011, 2012, 2014-2017 William Bader <[email protected]> // Copyright (C) 2009 Kovid Goyal <[email protected]> -// Copyright (C) 2009-2011, 2013-2015 Adrian Johnson <[email protected]> +// Copyright (C) 2009-2011, 2013-2015, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2012, 2014 Fabio D'Urso <[email protected]> // Copyright (C) 2012 Lu Wang <[email protected]> // Copyright (C) 2014 Till Kamppeter <[email protected]> diff --git a/poppler/PSOutputDev.h b/poppler/PSOutputDev.h index 56798a7b..fd1bea17 100644 --- a/poppler/PSOutputDev.h +++ b/poppler/PSOutputDev.h @@ -22,7 +22,7 @@ // Copyright (C) 2009 Carlos Garcia Campos <[email protected]> // Copyright (C) 2009, 2011, 2015-2017 William Bader <[email protected]> // Copyright (C) 2010 Hib Eris <[email protected]> -// Copyright (C) 2011, 2014 Adrian Johnson <[email protected]> +// Copyright (C) 2011, 2014, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2012 Fabio D'Urso <[email protected]> // // To see a description of the changes please see the Changelog file that diff --git a/poppler/Page.cc b/poppler/Page.cc index 81402335..ca4a5a6d 100644 --- a/poppler/Page.cc +++ b/poppler/Page.cc @@ -27,7 +27,7 @@ // Copyright (C) 2012, 2013 Fabio D'Urso <[email protected]> // Copyright (C) 2013, 2014 Thomas Freitag <[email protected]> // Copyright (C) 2013 Jason Crain <[email protected]> -// Copyright (C) 2013 Adrian Johnson <[email protected]> +// Copyright (C) 2013, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2015 Philipp Reinkemeier <[email protected]> // // To see a description of the changes please see the Changelog file that diff --git a/poppler/Page.h b/poppler/Page.h index 054491b1..97b70a0c 100644 --- a/poppler/Page.h +++ b/poppler/Page.h @@ -22,7 +22,7 @@ // Copyright (C) 2012 Fabio D'Urso <[email protected]> // Copyright (C) 2012, 2017 Albert Astals Cid <[email protected]> // Copyright (C) 2013 Thomas Freitag <[email protected]> -// Copyright (C) 2013 Adrian Johnson <[email protected]> +// Copyright (C) 2013, 2017 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/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc index ea84d0ce..28174356 100644 --- a/poppler/SplashOutputDev.cc +++ b/poppler/SplashOutputDev.cc @@ -29,7 +29,7 @@ // Copyright (C) 2010 Christian Feuersänger <[email protected]> // Copyright (C) 2011 Andreas Hartmetz <[email protected]> // Copyright (C) 2011 Andrea Canciani <[email protected]> -// Copyright (C) 2011, 2012 Adrian Johnson <[email protected]> +// Copyright (C) 2011, 2012, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2013 Lu Wang <[email protected]> // Copyright (C) 2013 Li Junling <[email protected]> // Copyright (C) 2014 Ed Porras <[email protected]> diff --git a/poppler/SplashOutputDev.h b/poppler/SplashOutputDev.h index 0b49ddeb..05b7e943 100644 --- a/poppler/SplashOutputDev.h +++ b/poppler/SplashOutputDev.h @@ -19,7 +19,7 @@ // Copyright (C) 2010 Christian Feuersänger <[email protected]> // Copyright (C) 2011 Andreas Hartmetz <[email protected]> // Copyright (C) 2011 Andrea Canciani <[email protected]> -// Copyright (C) 2011 Adrian Johnson <[email protected]> +// Copyright (C) 2011, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2012, 2015 Albert Astals Cid <[email protected]> // Copyright (C) 2015, 2016 William Bader <[email protected]> // diff --git a/poppler/StructTreeRoot.cc b/poppler/StructTreeRoot.cc index f7c7153b..5f561115 100644 --- a/poppler/StructTreeRoot.cc +++ b/poppler/StructTreeRoot.cc @@ -8,6 +8,7 @@ // Copyright 2014 Fabio D'Urso <[email protected]> // Copyright 2017 Jan-Erik S <[email protected]> // Copyright 2017 Albert Astals Cid <[email protected]> +// Copyright 2017 Adrian Johnson <[email protected]> // //======================================================================== diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc index 4a51e6fc..9a77d050 100644 --- a/poppler/TextOutputDev.cc +++ b/poppler/TextOutputDev.cc @@ -18,7 +18,7 @@ // Copyright (C) 2006-2008, 2011-2013 Carlos Garcia Campos <[email protected]> // Copyright (C) 2006, 2007, 2013 Ed Catmur <[email protected]> // Copyright (C) 2006 Jeff Muizelaar <[email protected]> -// Copyright (C) 2007, 2008, 2012 Adrian Johnson <[email protected]> +// Copyright (C) 2007, 2008, 2012, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2008 Koji Otani <[email protected]> // Copyright (C) 2008, 2010-2012, 2014-2017 Albert Astals Cid <[email protected]> // Copyright (C) 2008 Pino Toscano <[email protected]> diff --git a/poppler/TextOutputDev.h b/poppler/TextOutputDev.h index 675ed600..380301fd 100644 --- a/poppler/TextOutputDev.h +++ b/poppler/TextOutputDev.h @@ -16,7 +16,7 @@ // Copyright (C) 2005-2007 Kristian Høgsberg <[email protected]> // Copyright (C) 2006 Ed Catmur <[email protected]> // Copyright (C) 2007, 2008, 2011, 2013 Carlos Garcia Campos <[email protected]> -// Copyright (C) 2007 Adrian Johnson <[email protected]> +// Copyright (C) 2007, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2008, 2010, 2015, 2016 Albert Astals Cid <[email protected]> // Copyright (C) 2010 Brian Ewins <[email protected]> // Copyright (C) 2012, 2013, 2015, 2016 Jason Crain <[email protected]> diff --git a/poppler/UnicodeMap.cc b/poppler/UnicodeMap.cc index ebffbe5e..0340ef65 100644 --- a/poppler/UnicodeMap.cc +++ b/poppler/UnicodeMap.cc @@ -15,6 +15,7 @@ // // Copyright (C) 2010 Jakub Wilk <[email protected]> // Copyright (C) 2017 Albert Astals Cid <[email protected]> +// Copyright (C) 2017 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/poppler/UnicodeMap.h b/poppler/UnicodeMap.h index 6332bece..46b4c0f9 100644 --- a/poppler/UnicodeMap.h +++ b/poppler/UnicodeMap.h @@ -8,6 +8,20 @@ // //======================================================================== +//======================================================================== +// +// Modified under the Poppler project - http://poppler.freedesktop.org +// +// All changes made under the Poppler project to this file are licensed +// under GPL version 2 or later +// +// Copyright (C) 2017 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 +// +//======================================================================== + #ifndef UNICODEMAP_H #define UNICODEMAP_H diff --git a/poppler/XRef.cc b/poppler/XRef.cc index 69870bde..e37d5494 100644 --- a/poppler/XRef.cc +++ b/poppler/XRef.cc @@ -22,7 +22,7 @@ // Copyright (C) 2010 Hib Eris <[email protected]> // Copyright (C) 2012, 2013, 2016 Thomas Freitag <[email protected]> // Copyright (C) 2012, 2013 Fabio D'Urso <[email protected]> -// Copyright (C) 2013, 2014 Adrian Johnson <[email protected]> +// Copyright (C) 2013, 2014, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2013 Pino Toscano <[email protected]> // Copyright (C) 2016 Jakub Alba <[email protected]> // diff --git a/poppler/XRef.h b/poppler/XRef.h index 983991e6..9306a99b 100644 --- a/poppler/XRef.h +++ b/poppler/XRef.h @@ -21,7 +21,7 @@ // Copyright (C) 2010 Hib Eris <[email protected]> // Copyright (C) 2012, 2013, 2016 Thomas Freitag <[email protected]> // Copyright (C) 2012, 2013 Fabio D'Urso <[email protected]> -// Copyright (C) 2013 Adrian Johnson <[email protected]> +// Copyright (C) 2013, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2016 Jakub Alba <[email protected]> // // To see a description of the changes please see the Changelog file that diff --git a/poppler/poppler-config.h.cmake b/poppler/poppler-config.h.cmake index 2e8cb0d7..3a13e811 100644 --- a/poppler/poppler-config.h.cmake +++ b/poppler/poppler-config.h.cmake @@ -16,6 +16,7 @@ // Copyright (C) 2014 Bogdan Cristea <[email protected]> // Copyright (C) 2014 Hib Eris <[email protected]> // Copyright (C) 2016 Tor Lillqvist <[email protected]> +// Copyright (C) 2017 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/qt4/src/ArthurOutputDev.cc b/qt4/src/ArthurOutputDev.cc index 8b5caeec..f2fa6f17 100644 --- a/qt4/src/ArthurOutputDev.cc +++ b/qt4/src/ArthurOutputDev.cc @@ -22,6 +22,7 @@ // Copyright (C) 2011 Andreas Hartmetz <[email protected]> // Copyright (C) 2013 Thomas Freitag <[email protected]> // Copyright (C) 2013 Dominik Haumann <[email protected]> +// Copyright (C) 2017 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/qt4/src/poppler-document.cc b/qt4/src/poppler-document.cc index e639beb5..d6e2fbf7 100644 --- a/qt4/src/poppler-document.cc +++ b/qt4/src/poppler-document.cc @@ -10,6 +10,7 @@ * Copyright (C) 2014 Adam Reichold <[email protected]> * Copyright (C) 2015 William Bader <[email protected]> * Copyright (C) 2016 Jakub Alba <[email protected]> + * Copyright (C) 2017 Adrian Johnson <[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-page.cc b/qt4/src/poppler-page.cc index b9d387a0..ffe6e99c 100644 --- a/qt4/src/poppler-page.cc +++ b/qt4/src/poppler-page.cc @@ -16,6 +16,7 @@ * Copyright (C) 2012, 2013 Thomas Freitag <[email protected]> * Copyright (C) 2015 William Bader <[email protected]> * Copyright (C) 2016 Arseniy Lartsev <[email protected]> + * Copyright (C) 2017 Adrian Johnson <[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/ArthurOutputDev.cc b/qt5/src/ArthurOutputDev.cc index 8d3c801e..0ec029f2 100644 --- a/qt5/src/ArthurOutputDev.cc +++ b/qt5/src/ArthurOutputDev.cc @@ -24,6 +24,7 @@ // Copyright (C) 2013 Dominik Haumann <[email protected]> // Copyright (C) 2013 Mihai Niculescu <[email protected]> // Copyright (C) 2017 Oliver Sander <[email protected]> +// Copyright (C) 2017 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/qt5/src/poppler-document.cc b/qt5/src/poppler-document.cc index 3ae96a11..03077f99 100644 --- a/qt5/src/poppler-document.cc +++ b/qt5/src/poppler-document.cc @@ -10,6 +10,7 @@ * Copyright (C) 2014 Adam Reichold <[email protected]> * Copyright (C) 2015 William Bader <[email protected]> * Copyright (C) 2016 Jakub Alba <[email protected]> + * Copyright (C) 2017 Adrian Johnson <[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-page.cc b/qt5/src/poppler-page.cc index e0672727..9dcdaad9 100644 --- a/qt5/src/poppler-page.cc +++ b/qt5/src/poppler-page.cc @@ -18,6 +18,7 @@ * Copyright (C) 2016 Arseniy Lartsev <[email protected]> * Copyright (C) 2016, Hanno Meyer-Thurow <[email protected]> * Copyright (C) 2017, Oliver Sander <[email protected]> + * Copyright (C) 2017 Adrian Johnson <[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/splash/Splash.cc b/splash/Splash.cc index 2c78d60a..129d01f0 100644 --- a/splash/Splash.cc +++ b/splash/Splash.cc @@ -17,7 +17,7 @@ // Copyright (C) 2010 Christian Feuersänger <[email protected]> // Copyright (C) 2011-2013, 2015 William Bader <[email protected]> // Copyright (C) 2012 Markus Trippelsdorf <[email protected]> -// Copyright (C) 2012 Adrian Johnson <[email protected]> +// Copyright (C) 2012, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2012 Matthias Kramm <[email protected]> // // To see a description of the changes please see the Changelog file that diff --git a/splash/Splash.h b/splash/Splash.h index 87e56093..907e4c3b 100644 --- a/splash/Splash.h +++ b/splash/Splash.h @@ -15,7 +15,7 @@ // Copyright (C) 2007, 2011 Albert Astals Cid <[email protected]> // Copyright (C) 2010-2013, 2015 Thomas Freitag <[email protected]> // Copyright (C) 2010 Christian Feuersänger <[email protected]> -// Copyright (C) 2012 Adrian Johnson <[email protected]> +// Copyright (C) 2012, 2017 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/splash/SplashFTFont.cc b/splash/SplashFTFont.cc index 268f50e6..91226da0 100644 --- a/splash/SplashFTFont.cc +++ b/splash/SplashFTFont.cc @@ -17,6 +17,7 @@ // Copyright (C) 2010 Suzuki Toshiya <[email protected]> // Copyright (C) 2011 Andreas Hartmetz <[email protected]> // Copyright (C) 2012 Thomas Freitag <[email protected]> +// Copyright (C) 2017 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/splash/SplashFTFont.h b/splash/SplashFTFont.h index f354210a..5f0d1976 100644 --- a/splash/SplashFTFont.h +++ b/splash/SplashFTFont.h @@ -14,6 +14,7 @@ // Copyright (C) 2007-2009, 2011 Albert Astals Cid <[email protected]> // Copyright (C) 2009 Petr Gajdos <[email protected]> // Copyright (C) 2011 Andreas Hartmetz <[email protected]> +// Copyright (C) 2017 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/splash/SplashFTFontEngine.cc b/splash/SplashFTFontEngine.cc index eb1d8cf1..9b20f4a1 100644 --- a/splash/SplashFTFontEngine.cc +++ b/splash/SplashFTFontEngine.cc @@ -15,6 +15,7 @@ // Copyright (C) 2009, 2011, 2012 Albert Astals Cid <[email protected]> // Copyright (C) 2009 Petr Gajdos <[email protected]> // Copyright (C) 2011 Andreas Hartmetz <[email protected]> +// Copyright (C) 2017 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/splash/SplashFTFontEngine.h b/splash/SplashFTFontEngine.h index 37835bcb..899458bc 100644 --- a/splash/SplashFTFontEngine.h +++ b/splash/SplashFTFontEngine.h @@ -16,6 +16,7 @@ // Copyright (C) 2009 Albert Astals Cid <[email protected]> // Copyright (C) 2011 Andreas Hartmetz <[email protected]> // Copyright (C) 2013 Thomas Freitag <[email protected]> +// Copyright (C) 2017 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/splash/SplashFTFontFile.cc b/splash/SplashFTFontFile.cc index a03f9862..3c070b70 100644 --- a/splash/SplashFTFontFile.cc +++ b/splash/SplashFTFontFile.cc @@ -12,7 +12,7 @@ // under GPL version 2 or later // // Copyright (C) 2006 Takashi Iwai <[email protected]> -// Copyright (C) 2014 Adrian Johnson <[email protected]> +// Copyright (C) 2014, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2017 Oliver Sander <[email protected]> // // To see a description of the changes please see the Changelog file that diff --git a/splash/SplashFTFontFile.h b/splash/SplashFTFontFile.h index e26c5231..5931be3f 100644 --- a/splash/SplashFTFontFile.h +++ b/splash/SplashFTFontFile.h @@ -13,6 +13,7 @@ // // Copyright (C) 2006 Takashi Iwai <[email protected]> // Copyright (C) 2017 Oliver Sander <[email protected]> +// Copyright (C) 2017 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/splash/SplashFontEngine.cc b/splash/SplashFontEngine.cc index d8dd3e2f..62e5a019 100644 --- a/splash/SplashFontEngine.cc +++ b/splash/SplashFontEngine.cc @@ -18,6 +18,7 @@ // Copyright (C) 2011 Andreas Hartmetz <[email protected]> // Copyright (C) 2013 Thomas Freitag <[email protected]> // Copyright (C) 2015 Dmytro Morgun <[email protected]> +// Copyright (C) 2017 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/splash/SplashFontEngine.h b/splash/SplashFontEngine.h index 9f0ae0e6..e3ee1ce6 100644 --- a/splash/SplashFontEngine.h +++ b/splash/SplashFontEngine.h @@ -16,6 +16,7 @@ // Copyright (C) 2009, 2011 Albert Astals Cid <[email protected]> // Copyright (C) 2011 Andreas Hartmetz <[email protected]> // Copyright (C) 2013 Thomas Freitag <[email protected]> +// Copyright (C) 2017 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/splash/SplashMath.h b/splash/SplashMath.h index 8b3b5040..36793ea3 100644 --- a/splash/SplashMath.h +++ b/splash/SplashMath.h @@ -12,6 +12,7 @@ // under GPL version 2 or later // // Copyright (C) 2009-2011 Albert Astals Cid <[email protected]> +// Copyright (C) 2017 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/splash/SplashState.cc b/splash/SplashState.cc index ac10185d..abd94084 100644 --- a/splash/SplashState.cc +++ b/splash/SplashState.cc @@ -12,6 +12,7 @@ // under GPL version 2 or later // // Copyright (C) 2009, 2011, 2012, 2015 Thomas Freitag <[email protected]> +// Copyright (C) 2017 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/splash/SplashState.h b/splash/SplashState.h index 38e34fda..32270382 100644 --- a/splash/SplashState.h +++ b/splash/SplashState.h @@ -12,6 +12,7 @@ // under GPL version 2 or later // // Copyright (C) 2011, 2012, 2015 Thomas Freitag <[email protected]> +// Copyright (C) 2017 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/splash/SplashTypes.h b/splash/SplashTypes.h index 19b0570c..ca0e3bc0 100644 --- a/splash/SplashTypes.h +++ b/splash/SplashTypes.h @@ -16,6 +16,7 @@ // Copyright (C) 2009, 2011-2013 Thomas Freitag <[email protected]> // Copyright (C) 2009 Stefan Thomas <[email protected]> // Copyright (C) 2010 William Bader <[email protected]> +// Copyright (C) 2017 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/splash/SplashXPath.cc b/splash/SplashXPath.cc index 23db4eb8..9c5c8813 100644 --- a/splash/SplashXPath.cc +++ b/splash/SplashXPath.cc @@ -14,6 +14,7 @@ // Copyright (C) 2010 PaweÅ Wiejacha <[email protected]> // Copyright (C) 2010, 2011 Albert Astals Cid <[email protected]> // Copyright (C) 2013 Thomas Freitag <[email protected]> +// Copyright (C) 2017 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/pdfimages.cc b/utils/pdfimages.cc index 5e006057..d11b0147 100644 --- a/utils/pdfimages.cc +++ b/utils/pdfimages.cc @@ -18,7 +18,7 @@ // Copyright (C) 2007-2008, 2010 Albert Astals Cid <[email protected]> // Copyright (C) 2010 Hib Eris <[email protected]> // Copyright (C) 2010 Jakob Voss <[email protected]> -// Copyright (C) 2012, 2013 Adrian Johnson <[email protected]> +// Copyright (C) 2012, 2013, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2013 Suzuki Toshiya <[email protected]> // // To see a description of the changes please see the Changelog file that diff --git a/utils/pdftocairo-win32.cc b/utils/pdftocairo-win32.cc index 6d4f083d..9e52b6c8 100644 --- a/utils/pdftocairo-win32.cc +++ b/utils/pdftocairo-win32.cc @@ -3,7 +3,7 @@ // This file is licensed under the GPLv2 or later // // Copyright (C) 2014 Rodrigo Rivas Costa <[email protected]> -// Copyright (C) 2014 Adrian Johnson <[email protected]> +// Copyright (C) 2014, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2017 Albert Astals Cid <[email protected]> // // To see a description of the changes please see the Changelog file that diff --git a/utils/pdftoppm.cc b/utils/pdftoppm.cc index 20f59ef7..5cd9f53c 100644 --- a/utils/pdftoppm.cc +++ b/utils/pdftoppm.cc @@ -19,7 +19,7 @@ // Copyright (C) 2009 Shen Liang <[email protected]> // Copyright (C) 2009 Stefan Thomas <[email protected]> // Copyright (C) 2009-2011, 2015 Albert Astals Cid <[email protected]> -// Copyright (C) 2010, 2012 Adrian Johnson <[email protected]> +// Copyright (C) 2010, 2012, 2017 Adrian Johnson <[email protected]> // Copyright (C) 2010 Hib Eris <[email protected]> // Copyright (C) 2010 Jonathan Liu <[email protected]> // Copyright (C) 2010 William Bader <[email protected]> diff --git a/utils/pdftops.cc b/utils/pdftops.cc index 816fef4d..e415fcae 100644 --- a/utils/pdftops.cc +++ b/utils/pdftops.cc @@ -23,7 +23,7 @@ // Copyright (C) 2010 Hib Eris <[email protected]> // Copyright (C) 2012 Thomas Freitag <[email protected]> // Copyright (C) 2013 Suzuki Toshiya <[email protected]> -// Copyright (C) 2014 Adrian Johnson <[email protected]> +// Copyright (C) 2014, 2017 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 commit b8b6a7c9240d1b98e79463ea93245127ac56e764 Author: Sandro Mani <[email protected]> Date: Fri Nov 3 10:37:25 2017 +0100 mingw: change library names to include the soversion Bug #103157 diff --git a/CMakeLists.txt b/CMakeLists.txt index df70c153..3b0b9126 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -545,6 +545,10 @@ else() add_library(poppler ${poppler_SRCS}) endif() set_target_properties(poppler PROPERTIES VERSION 71.0.0 SOVERSION 71) +if(MINGW) + get_target_property(POPPLER_SOVERSION poppler SOVERSION) + set_target_properties(poppler PROPERTIES SUFFIX "-${POPPLER_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") +endif() target_link_libraries(poppler LINK_PRIVATE ${poppler_LIBS}) if(CMAKE_USE_PTHREADS_INIT) target_link_libraries(poppler LINK_PRIVATE Threads::Threads) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 1cb26daf..1fb20bb4 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -24,6 +24,10 @@ set(poppler_cpp_SRCS add_library(poppler-cpp SHARED ${poppler_cpp_SRCS}) set_target_properties(poppler-cpp PROPERTIES VERSION 0.3.0 SOVERSION 0) +if(MINGW) + get_target_property(POPPLER_CPP_SOVERSION poppler-cpp SOVERSION) + set_target_properties(poppler-cpp PROPERTIES SUFFIX "-${POPPLER_CPP_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") +endif() target_link_libraries(poppler-cpp poppler ${ICONV_LIBRARIES}) install(TARGETS poppler-cpp RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt index a34b9294..e089ef8e 100644 --- a/glib/CMakeLists.txt +++ b/glib/CMakeLists.txt @@ -82,6 +82,10 @@ set(poppler_glib_generated_SRCS ) add_library(poppler-glib SHARED ${poppler_glib_SRCS} ${poppler_glib_generated_SRCS}) set_target_properties(poppler-glib PROPERTIES VERSION 8.9.0 SOVERSION 8) +if(MINGW) + get_target_property(POPPLER_GLIB_SOVERSION poppler-glib SOVERSION) + set_target_properties(poppler-glib PROPERTIES SUFFIX "-${POPPLER_GLIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") +endif() target_link_libraries(poppler-glib poppler ${GLIB2_LIBRARIES} ${CAIRO_LIBRARIES} ${FREETYPE_LIBRARIES}) if(CMAKE_USE_PTHREADS_INIT) target_link_libraries(poppler-glib Threads::Threads) diff --git a/qt4/src/CMakeLists.txt b/qt4/src/CMakeLists.txt index 55ca97b0..f6547726 100644 --- a/qt4/src/CMakeLists.txt +++ b/qt4/src/CMakeLists.txt @@ -31,6 +31,10 @@ set(poppler_qt4_SRCS qt4_automoc(${poppler_qt4_SRCS}) add_library(poppler-qt4 SHARED ${poppler_qt4_SRCS}) set_target_properties(poppler-qt4 PROPERTIES VERSION 4.11.0 SOVERSION 4) +if(MINGW) + get_target_property(POPPLER_QT4_SOVERSION poppler-qt4 SOVERSION) + set_target_properties(poppler-qt4 PROPERTIES SUFFIX "-${POPPLER_QT4_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") +endif() target_link_libraries(poppler-qt4 poppler ${QT4_QTCORE_LIBRARY} ${QT4_QTGUI_LIBRARY} ${QT4_QTXML_LIBRARY}) if(MSVC) target_link_libraries(poppler-qt4 poppler ${poppler_LIBS}) diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt index 113140a3..7993c33b 100644 --- a/qt5/src/CMakeLists.txt +++ b/qt5/src/CMakeLists.txt @@ -31,6 +31,10 @@ set(poppler_qt5_SRCS ) add_library(poppler-qt5 SHARED ${poppler_qt5_SRCS}) set_target_properties(poppler-qt5 PROPERTIES VERSION 1.11.0 SOVERSION 1) +if(MINGW) + get_target_property(POPPLER_QT5_SOVERSION poppler-qt5 SOVERSION) + set_target_properties(poppler-qt5 PROPERTIES SUFFIX "-${POPPLER_QT5_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") +endif() target_link_libraries(poppler-qt5 poppler ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Xml_LIBRARIES}) if(MSVC) target_link_libraries(poppler-qt5 poppler ${poppler_LIBS})
_______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
