[poppler] poppler/GfxState_helpers.h poppler/PageLabelInfo.h poppler/PageLabelInfo_p.h poppler/UnicodeMapFuncs.h qt5/src utils/Win32Console.h
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Mar 21 19:28:55 UTC 2019
poppler/GfxState_helpers.h | 7 ++++++-
poppler/PageLabelInfo.h | 7 ++++++-
poppler/PageLabelInfo_p.h | 7 ++++++-
poppler/UnicodeMapFuncs.h | 7 ++++++-
qt5/src/poppler-annotation-helper.h | 5 +++++
qt5/src/poppler-page-transition-private.h | 7 ++++++-
utils/Win32Console.h | 6 ++++++
7 files changed, 41 insertions(+), 5 deletions(-)
New commits:
commit 5a5ae212c8e476dbddb9ce8f7a5e30589ba6c8e5
Author: Albert Astals Cid <aacid at kde.org>
Date: Thu Mar 21 20:01:12 2019 +0100
Add missing include guards
diff --git a/poppler/GfxState_helpers.h b/poppler/GfxState_helpers.h
index 8c1149e9..6e434a65 100644
--- a/poppler/GfxState_helpers.h
+++ b/poppler/GfxState_helpers.h
@@ -13,13 +13,16 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2009, 2011, 2018 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2009, 2011, 2018, 2019 Albert Astals Cid <aacid at kde.org>
//
// 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 GFXSTATE_HELPERS_H
+#define GFXSTATE_HELPERS_H
+
#include "GfxState.h"
static inline GfxColorComp clip01(GfxColorComp x) {
@@ -80,3 +83,5 @@ static inline void cmykToRGBMatrixMultiplication(const double c, const double m,
g += 0.2119 * x;
b += 0.2235 * x;
}
+
+#endif
diff --git a/poppler/PageLabelInfo.h b/poppler/PageLabelInfo.h
index b5ad57ca..19c87d5a 100644
--- a/poppler/PageLabelInfo.h
+++ b/poppler/PageLabelInfo.h
@@ -3,7 +3,7 @@
// This file is under the GPLv2 or later license
//
// Copyright (C) 2005-2006 Kristian Høgsberg <krh at redhat.com>
-// Copyright (C) 2005, 2018 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005, 2018, 2019 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2018 Adam Reichold <adam.reichold at t-online.de>
//
// To see a description of the changes please see the Changelog file that
@@ -11,6 +11,9 @@
//
//========================================================================
+#ifndef PAGELABELINFO_H
+#define PAGELABELINFO_H
+
#include <limits.h>
#include <stdlib.h>
#include <stdio.h>
@@ -52,3 +55,5 @@ private:
std::vector<Interval> intervals;
};
+
+#endif
diff --git a/poppler/PageLabelInfo_p.h b/poppler/PageLabelInfo_p.h
index 5647ad71..bb4026e2 100644
--- a/poppler/PageLabelInfo_p.h
+++ b/poppler/PageLabelInfo_p.h
@@ -3,7 +3,7 @@
// This file is under the GPLv2 or later license
//
// Copyright (C) 2005-2006 Kristian Høgsberg <krh at redhat.com>
-// Copyright (C) 2005, 2009, 2014 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005, 2009, 2014, 2019 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2011 Simon Kellner <kellner at kit.edu>
// Copyright (C) 2012 Fabio D'Urso <fabiodurso at hotmail.it>
// Copyright (C) 2018 Adam Reichold <adam.reichold at t-online.de>
@@ -13,6 +13,9 @@
//
//========================================================================
+#ifndef PAGELABELINFO_P_H
+#define PAGELABELINFO_P_H
+
/* http://mathworld.wolfram.com/RomanNumerals.html */
#include "config.h"
@@ -186,3 +189,5 @@ static void toLatin(int number, GooString *str, bool uppercase) {
for (i = 0; i < count; i++)
str->append(letter);
}
+
+#endif
diff --git a/poppler/UnicodeMapFuncs.h b/poppler/UnicodeMapFuncs.h
index 61336396..f528793f 100644
--- a/poppler/UnicodeMapFuncs.h
+++ b/poppler/UnicodeMapFuncs.h
@@ -15,15 +15,20 @@
//
// Copyright (C) 2008 Koji Otani <sho at bbr.jp>
// Copyright (C) 2017 Adrian Johnson <ajohnson at redneon.com>
-// Copyright (C) 2018 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2018, 2019 Albert Astals Cid <aacid at kde.org>
//
// 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 UNICODEMAPFUNCS_H
+#define UNICODEMAPFUNCS_H
+
#include "UTF.h"
int mapUTF8(Unicode u, char *buf, int bufSize);
int mapUTF16(Unicode u, char *buf, int bufSize);
+
+#endif
diff --git a/qt5/src/poppler-annotation-helper.h b/qt5/src/poppler-annotation-helper.h
index d8193c65..7e57a030 100644
--- a/qt5/src/poppler-annotation-helper.h
+++ b/qt5/src/poppler-annotation-helper.h
@@ -23,6 +23,9 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#ifndef _POPPLER_ANNOTATION_HELPER_H_
+#define _POPPLER_ANNOTATION_HELPER_H_
+
#include <memory>
#include <QtCore/QDebug>
@@ -184,3 +187,5 @@ QColor convertAnnotColor( const AnnotColor *color );
std::unique_ptr<AnnotColor> convertQColor( const QColor &color );
}
+
+#endif
diff --git a/qt5/src/poppler-page-transition-private.h b/qt5/src/poppler-page-transition-private.h
index 63febb09..ee198942 100644
--- a/qt5/src/poppler-page-transition-private.h
+++ b/qt5/src/poppler-page-transition-private.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005, Albert Astals Cid
+ * Copyright (C) 2005, 2019, Albert Astals Cid <aacid at kde.org>
*
* 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
@@ -16,6 +16,9 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#ifndef _POPPLER_PAGE_TRANSITION_PRIVATE_H_
+#define _POPPLER_PAGE_TRANSITION_PRIVATE_H_
+
class Object;
namespace Poppler {
@@ -26,3 +29,5 @@ class PageTransitionParams {
};
}
+
+#endif
diff --git a/utils/Win32Console.h b/utils/Win32Console.h
index 46381000..4ea62501 100644
--- a/utils/Win32Console.h
+++ b/utils/Win32Console.h
@@ -5,12 +5,16 @@
// This file is licensed under the GPLv2 or later
//
// Copyright (C) 2017 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2019 Albert Astals Cid <aacid at kde.org>
//
// 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 WIN32CONSOLE_H
+#define WIN32CONSOLE_H
+
// UTF-8 Support for win32 console
//
// Converts argc/argv to UTF-8. Supports UTF-8 stdout/stderr to win32 console.
@@ -61,3 +65,5 @@ public:
};
#endif // _WIN32
+
+#endif
More information about the poppler
mailing list