.gitlab-ci.yml | 4 ++--
README.contributors | 2 +-
poppler/Annot.cc | 21 +++++++++++----------
poppler/Catalog.cc | 8 ++++++--
4 files changed, 20 insertions(+), 15 deletions(-)
New commits:
commit 5b8f942fe4b9e0d3aeed3422b92362018d88429c
Author: Albert Astals Cid <aa...@kde.org>
Date: Wed Feb 3 22:05:42 2021 +0100
CI: new clang-format
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c143682..ea7dffa3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,9 +30,9 @@ clang_format:
stage: build
before_script:
- apt-get update
- - apt-get install --yes --no-install-recommends git clang-format-10
+ - apt-get install --yes --no-install-recommends git clang-format-11
script:
- - find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name
"*.cc" \) -exec clang-format-10 -i {} \;
+ - find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name
"*.cc" \) -exec clang-format-11 -i {} \;
- git diff --exit-code
build:
diff --git a/README.contributors b/README.contributors
index 8c4162eb..e77d05e7 100644
--- a/README.contributors
+++ b/README.contributors
@@ -29,7 +29,7 @@ To get the clang-format warnings locally instead at CI time
we recommend you
to copy the hooks/pre-commit to your .git
cp hooks/pre-commit .git/hooks/
-We are using clang-format 10 on CI. Unfortunately clang-format is not totally
+We are using clang-format 11 on CI. Unfortunately clang-format is not totally
compatible with older versions of itself. If CI gives you trouble but your
local
clang-format disagrees, just apply the changes suggested by CI and then commit
with the --no-verify flag. If you get stuck, don't hesitate to ask the reviewer
diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index 58dc2c85..59115cc2 100644
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@ -219,16 +219,17 @@ static std::unique_ptr<LinkAction>
getAdditionalAction(Annot::AdditionalActionsT
Object additionalActionsObject = additionalActions->fetch(doc->getXRef());
if (additionalActionsObject.isDict()) {
- const char *key =
- (type == Annot::actionCursorEntering ? "E"
- : type ==
Annot::actionCursorLeaving ? "X"
-
: type == Annot::actionMousePressed ? "D"
-
: type ==
Annot::actionMouseReleased ? "U"
-
: type == Annot::actionFocusIn ? "Fo"
-
: type == Annot::actionFocusOut
- ? "Bl"
- : type ==
Annot::actionPageOpening ? "PO"
-
: type == Annot::actionPageClosing ? "PC" : type ==
Annot::actionPageVisible ? "PV" : type == Annot::actionPageInvisible ? "PI" :
nullptr);
+ const char *key = (type == Annot::actionCursorEntering ? "E"
+ : type == Annot::actionCursorLeaving ? "X"
+ : type == Annot::actionMousePressed ? "D"
+ : type == Annot::actionMouseReleased ? "U"
+ : type == Annot::actionFocusIn ? "Fo"
+ : type == Annot::actionFocusOut ? "Bl"
+ : type == Annot::actionPageOpening ? "PO"
+ : type == Annot::actionPageClosing ? "PC"
+ : type == Annot::actionPageVisible ? "PV"
+ : type == Annot::actionPageInvisible ? "PI"
+ :
nullptr);
Object actionObject = additionalActionsObject.dictLookup(key);
if (actionObject.isDict())
diff --git a/poppler/Catalog.cc b/poppler/Catalog.cc
index 001e3c5f..542f449a 100644
--- a/poppler/Catalog.cc
+++ b/poppler/Catalog.cc
@@ -1139,8 +1139,12 @@ std::unique_ptr<LinkAction>
Catalog::getAdditionalAction(DocumentAdditionalActio
{
Object additionalActionsObject = additionalActions.fetch(doc->getXRef());
if (additionalActionsObject.isDict()) {
- const char *key =
- (type == actionCloseDocument ? "WC" : type ==
actionSaveDocumentStart ? "WS" : type == actionSaveDocumentFinish ? "DS" : type
== actionPrintDocumentStart ? "WP" : type == actionPrintDocumentFinish ? "DP" :
nullptr);
+ const char *key = (type == actionCloseDocument ? "WC"
+ : type == actionSaveDocumentStart ? "WS"
+ : type == actionSaveDocumentFinish ? "DS"
+ : type == actionPrintDocumentStart ? "WP"
+ : type == actionPrintDocumentFinish ? "DP"
+ :
nullptr);
Object actionObject = additionalActionsObject.dictLookup(key);
if (actionObject.isDict())
_______________________________________________
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler
