goo/GooString.cc | 2 +- goo/GooString.h | 2 +- poppler/Array.h | 1 + poppler/CairoFontEngine.cc | 2 +- poppler/Error.cc | 2 +- poppler/Error.h | 2 +- poppler/PageLabelInfo.cc | 5 ++++- poppler/PageLabelInfo.h | 1 + poppler/SplashOutputDev.cc | 1 + utils/parseargs.cc | 6 +++--- utils/parseargs.h | 6 +++--- utils/pdftocairo.cc | 6 ++---- 12 files changed, 20 insertions(+), 16 deletions(-)
New commits: commit bdb0a44e069d5767b0a12623d8f8ec7fcb6a4a0e Author: Albert Astals Cid <[email protected]> Date: Sun Sep 23 02:28:33 2018 +0200 Include algorithm for std::max Fixes MSVC build diff --git a/poppler/PageLabelInfo.cc b/poppler/PageLabelInfo.cc index 048fe707..96c4c333 100644 --- a/poppler/PageLabelInfo.cc +++ b/poppler/PageLabelInfo.cc @@ -3,7 +3,7 @@ // This file is under the GPLv2 or later license // // Copyright (C) 2005-2006 Kristian Høgsberg <[email protected]> -// Copyright (C) 2005, 2009, 2013, 2017 Albert Astals Cid <[email protected]> +// Copyright (C) 2005, 2009, 2013, 2017, 2018 Albert Astals Cid <[email protected]> // Copyright (C) 2011 Simon Kellner <[email protected]> // Copyright (C) 2012 Fabio D'Urso <[email protected]> // Copyright (C) 2018 Adam Reichold <[email protected]> @@ -19,6 +19,8 @@ #include <stdio.h> #include <assert.h> +#include <algorithm> + #include "PageLabelInfo.h" #include "PageLabelInfo_p.h" commit 52f9386bdab2e5d90c3a0f5721012fdd9278bc00 Author: Albert Astals Cid <[email protected]> Date: Sun Sep 23 02:26:02 2018 +0200 Update (C) diff --git a/goo/GooString.cc b/goo/GooString.cc index 7a75ef45..6a625e2b 100644 --- a/goo/GooString.cc +++ b/goo/GooString.cc @@ -18,7 +18,7 @@ // Copyright (C) 2006 Kristian Høgsberg <[email protected]> // Copyright (C) 2006 Krzysztof Kowalczyk <[email protected]> // Copyright (C) 2007 Jeff Muizelaar <[email protected]> -// Copyright (C) 2008-2011, 2016, 2017 Albert Astals Cid <[email protected]> +// Copyright (C) 2008-2011, 2016-2018 Albert Astals Cid <[email protected]> // Copyright (C) 2011 Kenji Uno <[email protected]> // Copyright (C) 2012, 2013 Fabio D'Urso <[email protected]> // Copyright (C) 2012, 2017 Adrian Johnson <[email protected]> diff --git a/goo/GooString.h b/goo/GooString.h index 142fb684..38f3bed9 100644 --- a/goo/GooString.h +++ b/goo/GooString.h @@ -17,7 +17,7 @@ // // Copyright (C) 2006 Kristian Høgsberg <[email protected]> // Copyright (C) 2006 Krzysztof Kowalczyk <[email protected]> -// Copyright (C) 2008-2010, 2012, 2014, 2017 Albert Astals Cid <[email protected]> +// Copyright (C) 2008-2010, 2012, 2014, 2017, 2018 Albert Astals Cid <[email protected]> // Copyright (C) 2012-2014 Fabio D'Urso <[email protected]> // Copyright (C) 2013 Jason Crain <[email protected]> // Copyright (C) 2015, 2018 Adam Reichold <[email protected]> diff --git a/poppler/Array.h b/poppler/Array.h index bfb24170..a6764482 100644 --- a/poppler/Array.h +++ b/poppler/Array.h @@ -18,6 +18,7 @@ // Copyright (C) 2013 Thomas Freitag <[email protected]> // Copyright (C) 2017, 2018 Albert Astals Cid <[email protected]> // Copyright (C) 2017 Adrian Johnson <[email protected]> +// Copyright (C) 2018 Adam Reichold <[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/Error.cc b/poppler/Error.cc index 6c7e43b7..32c84d82 100644 --- a/poppler/Error.cc +++ b/poppler/Error.cc @@ -14,7 +14,7 @@ // under GPL version 2 or later // // Copyright (C) 2005, 2007 Jeff Muizelaar <[email protected]> -// Copyright (C) 2005 Albert Astals Cid <[email protected]> +// Copyright (C) 2005, 2018 Albert Astals Cid <[email protected]> // Copyright (C) 2007 Krzysztof Kowalczyk <[email protected]> // Copyright (C) 2012 Marek Kasik <[email protected]> // Copyright (C) 2013, 2017 Adrian Johnson <[email protected]> diff --git a/poppler/Error.h b/poppler/Error.h index f91d90fa..3e3597fd 100644 --- a/poppler/Error.h +++ b/poppler/Error.h @@ -14,7 +14,7 @@ // under GPL version 2 or later // // Copyright (C) 2005, 2007 Jeff Muizelaar <[email protected]> -// Copyright (C) 2005 Albert Astals Cid <[email protected]> +// Copyright (C) 2005, 2018 Albert Astals Cid <[email protected]> // Copyright (C) 2005 Kristian Høgsberg <[email protected]> // Copyright (C) 2013 Adrian Johnson <[email protected]> // Copyright (C) 2014 Fabio D'Urso <[email protected]> diff --git a/poppler/PageLabelInfo.cc b/poppler/PageLabelInfo.cc index 1d87d5ef..048fe707 100644 --- a/poppler/PageLabelInfo.cc +++ b/poppler/PageLabelInfo.cc @@ -6,6 +6,7 @@ // Copyright (C) 2005, 2009, 2013, 2017 Albert Astals Cid <[email protected]> // Copyright (C) 2011 Simon Kellner <[email protected]> // Copyright (C) 2012 Fabio D'Urso <[email protected]> +// Copyright (C) 2018 Adam Reichold <[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/PageLabelInfo.h b/poppler/PageLabelInfo.h index 432b4214..8f13a2af 100644 --- a/poppler/PageLabelInfo.h +++ b/poppler/PageLabelInfo.h @@ -4,6 +4,7 @@ // // Copyright (C) 2005-2006 Kristian Høgsberg <[email protected]> // Copyright (C) 2005, 2018 Albert Astals Cid <[email protected]> +// Copyright (C) 2018 Adam Reichold <[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 edf63a96..5cc725a9 100644 --- a/poppler/SplashOutputDev.cc +++ b/poppler/SplashOutputDev.cc @@ -40,6 +40,7 @@ // Copyright (C) 2017 Even Rouault <[email protected]> // Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <[email protected]>. Work sponsored by the LiMux project of the city of Munich // Copyright (C) 2018 Stefan Brüns <[email protected]> +// Copyright (C) 2018 Adam Reichold <[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/parseargs.cc b/utils/parseargs.cc index 37d44bff..af9dbba9 100644 --- a/utils/parseargs.cc +++ b/utils/parseargs.cc @@ -15,7 +15,7 @@ All changes made under the Poppler project to this file are licensed under GPL version 2 or later - Copyright (C) 2008, 2009 Albert Astals Cid <[email protected]> + Copyright (C) 2008, 2009, 2018 Albert Astals Cid <[email protected]> Copyright (C) 2011, 2012 Adrian Johnson <[email protected]> To see a description of the changes please see the Changelog file that diff --git a/utils/parseargs.h b/utils/parseargs.h index 22ae0ad6..71cd0f8d 100644 --- a/utils/parseargs.h +++ b/utils/parseargs.h @@ -13,7 +13,7 @@ All changes made under the Poppler project to this file are licensed under GPL version 2 or later - Copyright (C) 2008 Albert Astals Cid <[email protected]> + Copyright (C) 2008, 2018 Albert Astals Cid <[email protected]> Copyright (C) 2011 Adrian Johnson <[email protected]> To see a description of the changes please see the Changelog file that commit b719b3f00078051ca380d8c30767b48b359dd87f Author: Albert Astals Cid <[email protected]> Date: Sun Sep 23 02:21:56 2018 +0200 const char * diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc index b150b0bb..265e0dda 100644 --- a/poppler/CairoFontEngine.cc +++ b/poppler/CairoFontEngine.cc @@ -389,7 +389,7 @@ CairoFreeTypeFont::~CairoFreeTypeFont() { } CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Library lib, GBool useCIDs) { GooString *fileName; - char *fileNameC; + const char *fileNameC; char *font_data; int font_data_len; int i, n; commit 1e1f0c306f1e2626ad7774034a4df499da59e9f8 Author: Albert Astals Cid <[email protected]> Date: Sun Sep 23 02:21:45 2018 +0200 pdftocairo: const char * diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc index 68bad403..26c8e681 100644 --- a/utils/pdftocairo.cc +++ b/utils/pdftocairo.cc @@ -842,8 +842,6 @@ static GooString *getImageFileName(GooString *outputFileName, int numDigits, int static GooString *getOutputFileName(GooString *fileName, GooString *outputName) { GooString *name; - char *s; - char *p; if (outputName) { if (outputName->cmp("-") == 0) { @@ -871,8 +869,8 @@ static GooString *getOutputFileName(GooString *fileName, GooString *outputName) } // strip everything up to last '/' - s = fileName->getCString(); - p = strrchr(s, '/'); + const char *s = fileName->getCString(); + const char *p = strrchr(s, '/'); if (p) { p++; if (*p == 0) { commit f96e1f246435163328e3123d932608a3954f72bb Author: Albert Astals Cid <[email protected]> Date: Sun Sep 23 02:20:28 2018 +0200 parseargs: const char * diff --git a/utils/parseargs.cc b/utils/parseargs.cc index 279c86a8..37d44bff 100644 --- a/utils/parseargs.cc +++ b/utils/parseargs.cc @@ -177,7 +177,7 @@ static GBool grabArg(const ArgDesc *arg, int i, int *argc, char *argv[]) { return ok; } -GBool isInt(char *s) { +GBool isInt(const char *s) { if (*s == '-' || *s == '+') ++s; while (isdigit(*s)) @@ -187,7 +187,7 @@ GBool isInt(char *s) { return gTrue; } -GBool isFP(char *s) { +GBool isFP(const char *s) { int n; if (*s == '-' || *s == '+') diff --git a/utils/parseargs.h b/utils/parseargs.h index f035fa14..22ae0ad6 100644 --- a/utils/parseargs.h +++ b/utils/parseargs.h @@ -78,8 +78,8 @@ extern void printUsage(const char *program, const char *otherArgs, const ArgDesc /* * Check if a string is a valid integer or floating point number. */ -extern GBool isInt(char *s); -extern GBool isFP(char *s); +extern GBool isInt(const char *s); +extern GBool isFP(const char *s); #ifdef __cplusplus } _______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
