qt5/src/ArthurOutputDev.cc | 1 - qt5/src/poppler-outline-private.h | 3 ++- splash/Splash.cc | 4 ++-- test/gtk-test.cc | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 71830663e816a90841a2534ecc21a0923ab9dbba Author: Albert Astals Cid <[email protected]> Date: Fri Mar 29 17:43:42 2019 +0100 ArthurOutputDev: Fix shadow warning diff --git a/qt5/src/ArthurOutputDev.cc b/qt5/src/ArthurOutputDev.cc index 3eec3eb3..faa6407b 100644 --- a/qt5/src/ArthurOutputDev.cc +++ b/qt5/src/ArthurOutputDev.cc @@ -844,7 +844,6 @@ bool ArthurOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, } // set the color - GfxRGB rgb; shading->getColorSpace()->getRGB(&color1, &rgb); qColor.setRgb(colToByte(rgb.r), colToByte(rgb.g), colToByte(rgb.b)); gradient.setColorAt((ta[j] - tMin)/(tMax - tMin), qColor); commit 3d410e44ab50f064671f6b3c72f7e7eb8d015aeb Author: Albert Astals Cid <[email protected]> Date: Fri Mar 29 17:42:52 2019 +0100 gtk-test.cc: Rename variable to fix shadow warning diff --git a/test/gtk-test.cc b/test/gtk-test.cc index 5d2e285f..24fd39ce 100644 --- a/test/gtk-test.cc +++ b/test/gtk-test.cc @@ -17,14 +17,14 @@ #include <gtk/gtk.h> #include <math.h> -static int page = 0; +static int requested_page = 0; static gboolean cairo_output = FALSE; static gboolean splash_output = FALSE; static const char **file_arguments = nullptr; static const GOptionEntry options[] = { { "cairo", 'c', 0, G_OPTION_ARG_NONE, &cairo_output, "Cairo Output Device", nullptr}, { "splash", 's', 0, G_OPTION_ARG_NONE, &splash_output, "Splash Output Device", nullptr}, - { "page", 'p', 0, G_OPTION_ARG_INT, &page, "Page number", "PAGE" }, + { "page", 'p', 0, G_OPTION_ARG_INT, &requested_page, "Page number", "PAGE" }, { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &file_arguments, nullptr, "PDF-FILES…" }, { } }; @@ -394,7 +394,7 @@ main (int argc, char *argv []) view = view_new (doc); view_list = g_list_prepend (view_list, view); - view_set_page (view, CLAMP (page, 0, poppler_document_get_n_pages (doc) - 1)); + view_set_page (view, CLAMP (requested_page, 0, poppler_document_get_n_pages (doc) - 1)); } gtk_main (); commit 0593f2567c3887b9323bb7c73f6b62748b44722a Author: Albert Astals Cid <[email protected]> Date: Fri Mar 29 17:40:36 2019 +0100 OutlineItemData: Rename constructor params Fixes shadow warning diff --git a/qt5/src/poppler-outline-private.h b/qt5/src/poppler-outline-private.h index 01b7b83d..706404d3 100644 --- a/qt5/src/poppler-outline-private.h +++ b/qt5/src/poppler-outline-private.h @@ -1,6 +1,7 @@ /* poppler-outline-private.h: qt interface to poppler * * Copyright (C) 2018 Adam Reichold <[email protected]> + * Copyright (C) 2019 Albert Astals Cid <[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 @@ -32,7 +33,7 @@ class LinkDestination; struct OutlineItemData { - OutlineItemData(::OutlineItem *data, DocumentData *documentData) : data{data}, documentData{documentData} {} + OutlineItemData(::OutlineItem *oi, DocumentData *dd) : data{oi}, documentData{dd} {} ::OutlineItem *data; DocumentData *documentData; commit 0d56b4665ab296e8f152f1203ac11f5d21ecf36c Author: Albert Astals Cid <[email protected]> Date: Fri Mar 29 17:40:03 2019 +0100 Splash::makeDashedPath: Remove i declaration in for We already have one above and this causes a shadow warning diff --git a/splash/Splash.cc b/splash/Splash.cc index 127bc4aa..24bdce7b 100644 --- a/splash/Splash.cc +++ b/splash/Splash.cc @@ -11,7 +11,7 @@ // All changes made under the Poppler project to this file are licensed // under GPL version 2 or later // -// Copyright (C) 2005-2018 Albert Astals Cid <[email protected]> +// Copyright (C) 2005-2019 Albert Astals Cid <[email protected]> // Copyright (C) 2005 Marco Pesenti Gritti <[email protected]> // Copyright (C) 2010-2016 Thomas Freitag <[email protected]> // Copyright (C) 2010 Christian Feuersänger <[email protected]> @@ -2438,7 +2438,7 @@ SplashPath *Splash::makeDashedPath(SplashPath *path) { if (dPath->length == 0) { bool allSame = true; - for (int i = 0; allSame && i < path->length - 1; ++i) { + for (i = 0; allSame && i < path->length - 1; ++i) { allSame = path->pts[i].x == path->pts[i + 1].x && path->pts[i].y == path->pts[i + 1].y; } if (allSame) { _______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
