cpp/poppler-page.h | 6 +++--- qt5/src/QPainterOutputDev.cc | 3 ++- qt6/src/QPainterOutputDev.cc | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-)
New commits: commit ea8c6fe95ef63e0f6d6502d2521c0a0dac17cc1d Author: Albert Astals Cid <[email protected]> Date: Wed May 25 14:51:22 2022 +0200 Make gcc a bit happier diff --git a/cpp/poppler-page.h b/cpp/poppler-page.h index a3626abc..6041402c 100644 --- a/cpp/poppler-page.h +++ b/cpp/poppler-page.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2009-2010, Pino Toscano <[email protected]> * Copyright (C) 2018, 2020, Suzuki Toshiya <[email protected]> - * Copyright (C) 2018-2021, Albert Astals Cid <[email protected]> + * Copyright (C) 2018-2022, Albert Astals Cid <[email protected]> * Copyright (C) 2018, Zsombor Hollay-Horvath <[email protected]> * Copyright (C) 2018, Aleksey Nikolaev <[email protected]> * Copyright (C) 2020, Jiri Jakes <[email protected]> @@ -172,8 +172,8 @@ public: page_transition *transition() const; bool search(const ustring &text, rectf &r, search_direction_enum direction, case_sensitivity_enum case_sensitivity, rotation_enum rotation = rotate_0) const; - ustring text(const rectf &rect = rectf()) const; - ustring text(const rectf &rect, text_layout_enum layout_mode) const; + ustring text(const rectf &r = rectf()) const; + ustring text(const rectf &r, text_layout_enum layout_mode) const; /** Returns a list of text of the page diff --git a/qt5/src/QPainterOutputDev.cc b/qt5/src/QPainterOutputDev.cc index b68c0756..62f12727 100644 --- a/qt5/src/QPainterOutputDev.cc +++ b/qt5/src/QPainterOutputDev.cc @@ -14,7 +14,7 @@ // under GPL version 2 or later // // Copyright (C) 2005 Brad Hards <[email protected]> -// Copyright (C) 2005-2009, 2011, 2012, 2014, 2015, 2018, 2019, 2021 Albert Astals Cid <[email protected]> +// Copyright (C) 2005-2009, 2011, 2012, 2014, 2015, 2018, 2019, 2021, 2022 Albert Astals Cid <[email protected]> // Copyright (C) 2008, 2010 Pino Toscano <[email protected]> // Copyright (C) 2009, 2011 Carlos Garcia Campos <[email protected]> // Copyright (C) 2009 Petr Gajdos <[email protected]> @@ -394,6 +394,7 @@ void QPainterOutputDev::updateBlendMode(GfxState *state) break; default: qDebug() << "Unsupported blend mode, falling back to CompositionMode_SourceOver"; + [[fallthrough]]; case gfxBlendNormal: m_painter.top()->setCompositionMode(QPainter::CompositionMode_SourceOver); break; diff --git a/qt6/src/QPainterOutputDev.cc b/qt6/src/QPainterOutputDev.cc index b68c0756..62f12727 100644 --- a/qt6/src/QPainterOutputDev.cc +++ b/qt6/src/QPainterOutputDev.cc @@ -14,7 +14,7 @@ // under GPL version 2 or later // // Copyright (C) 2005 Brad Hards <[email protected]> -// Copyright (C) 2005-2009, 2011, 2012, 2014, 2015, 2018, 2019, 2021 Albert Astals Cid <[email protected]> +// Copyright (C) 2005-2009, 2011, 2012, 2014, 2015, 2018, 2019, 2021, 2022 Albert Astals Cid <[email protected]> // Copyright (C) 2008, 2010 Pino Toscano <[email protected]> // Copyright (C) 2009, 2011 Carlos Garcia Campos <[email protected]> // Copyright (C) 2009 Petr Gajdos <[email protected]> @@ -394,6 +394,7 @@ void QPainterOutputDev::updateBlendMode(GfxState *state) break; default: qDebug() << "Unsupported blend mode, falling back to CompositionMode_SourceOver"; + [[fallthrough]]; case gfxBlendNormal: m_painter.top()->setCompositionMode(QPainter::CompositionMode_SourceOver); break;
