Merge master into release (GH-2438)

Merge master into release

Author: dg0yt

.clang-tidy

@@ -1,5 +1,8 @@
 Checks: >-
   *,
+  -altera-id-dependent-backward-branch,
+  -altera-unroll-loops,
+  -bugprone-branch-clone,
   -bugprone-integer-division,
   -bugprone-narrowing-conversions,
   -bugprone-too-small-loop-variable,
@@ -9,6 +12,7 @@ Checks: >-
   -clang-analyzer-cplusplus.Move,
   -cppcoreguidelines-avoid-c-arrays,
   -cppcoreguidelines-avoid-magic-numbers,
+  -cppcoreguidelines-init-variables,
   -cppcoreguidelines-macro-usage,
   -cppcoreguidelines-narrowing-conversions,
   -cppcoreguidelines-non-private-member-variables-in-classes,
@@ -38,25 +42,31 @@ Checks: >-
   -modernize-use-emplace,
   -modernize-use-equals-default,
   -modernize-use-nullptr,
+  -modernize-use-trailing-return-type,
   -modernize-use-using,
   -performance-move-const-arg,
+  -performance-no-automatic-move,
   -performance-type-promotion-in-math-fn,
   -performance-unnecessary-copy-initialization,
   -performance-unnecessary-value-param,
   -readability-braces-around-statements,
   -readability-const-return-type,
   -readability-container-size-empty,
+  -readability-convert-member-functions-to-static,
   -readability-delete-null-pointer,
   -readability-else-after-return,
   -readability-implicit-bool-conversion,
   -readability-inconsistent-declaration-parameter-name,
   -readability-isolate-declaration,
   -readability-magic-numbers,
+  -readability-make-member-function-const,
   -readability-misleading-indentation,
   -readability-non-const-parameter,
+  -readability-qualified-auto,
   -readability-redundant-control-flow,
   -readability-redundant-declaration,
   -readability-redundant-member-init,
+  -readability-identifier-length,
   -readability-simplify-boolean-expr,
   -readability-static-accessed-through-instance,
   -readability-static-definition-in-anonymous-namespace,

3rd-party/cove/app/vectorizationconfigform.cpp

@@ -30,7 +30,6 @@
 
 #include "ui_vectorizationconfigform.h"
 
-class QDoubleValidator;
 class QWidget;
 
 namespace cove {
@@ -39,11 +38,9 @@ VectorizationConfigForm::VectorizationConfigForm(QWidget* parent)
 {
 	ui.setupUi(this);
 
-	QDoubleValidator* dv;
 	ui.shortPathLineEdit->setValidator(new QIntValidator(2, INT_MAX, this));
 	ui.joinDistanceLineEdit->setValidator(
-		dv = new QDoubleValidator(1, std::numeric_limits<double>::infinity(), 1,
-								  this));
+		new QDoubleValidator(1, std::numeric_limits<double>::infinity(), 1, this));
 	ui.distDirBalanceLineEdit->setValidator(
 		new QDoubleValidator(0, 1, 2, this));
 }

3rd-party/cove/libvectorizer/Concurrency.cpp

@@ -19,10 +19,6 @@
 
 #include "Concurrency.h"
 
-#include <memory>
-
-#include <QAtomicInteger>
-
 
 namespace cove {
 
@@ -36,6 +32,11 @@ namespace Concurrency {
 
 // ### Concurrency::Progress ###
 
+static_assert(std::is_copy_constructible<Progress>::value, "Concurrency::Progress must be copy constructible.");
+static_assert(std::is_move_constructible<Progress>::value, "Concurrency::Progress must be move constructible.");
+static_assert(!std::is_copy_assignable<Progress>::value, "Concurrency::Progress is not copy assignable.");
+static_assert(!std::is_move_assignable<Progress>::value, "Concurrency::Progress is not move assignable.");
+
 int Progress::getPercentage() const noexcept
 {
 	return data->percentage.load();
@@ -65,6 +66,15 @@ void TransformedProgress::setPercentage(int percentage)
 }
 
 
+// ### Concurrency::Job ###
+
+using ArbitraryResultType = int;
+static_assert(std::is_copy_constructible<Job<ArbitraryResultType>>::value, "Concurrency::Job must be copy constructible.");
+static_assert(std::is_move_constructible<Job<ArbitraryResultType>>::value, "Concurrency::Job must be move constructible.");
+static_assert(!std::is_copy_assignable<Job<ArbitraryResultType>>::value, "Concurrency::Job is not copy assignable.");
+static_assert(!std::is_move_assignable<Job<ArbitraryResultType>>::value, "Concurrency::Job is not move assignable.");
+
+
 }  // namespace Concurrency
 
 }  // cove

3rd-party/cove/libvectorizer/Concurrency.h

@@ -41,10 +41,13 @@ namespace Concurrency {
 /**
  * A class for the exchange of progress state during concurrent processing.
  * 
- * In order to allow copies to be made as needed by QtConcurrent,
- * the actual data is held via a std::shared_ptr. This std::shared_ptr object
- * is const in order to ensure thread safety also in accessing this object
+ * Copies of a Progress object share the same progress state.
+ * The actual data is held via a const std::shared_ptr, enabling
+ * shared ownership and safe concurrent access from multiple threads
  * (cf. std::shared_ptr documentation).
+ * 
+ * Assignment is not supported. It would require extra synchronization
+ * for concurrent access to the same object.
  */
 class Progress final : public ProgressObserver
 {
@@ -59,7 +62,7 @@ class Progress final : public ProgressObserver
 public:
 	Progress() : data(std::make_shared<Data>()) {}
 	Progress(const Progress&) = default;
-	Progress(Progress&& p) = delete;
+	Progress(Progress&& p) noexcept : Progress(static_cast<const Progress&>(p)) {};  // copy from const
 	Progress& operator=(const Progress&) = delete;
 	Progress& operator=(Progress&& p) = delete;
 	~Progress() override = default;
@@ -102,6 +105,8 @@ struct TransformedProgress : public ProgressObserver
  * 
  * It features the `QFuture` which signals the thread's total state and result,
  * and `Progress` information which is shared with the worker activity.
+ * 
+ * Assignment is not supported, following the choice made for Progress.
  */
 template <typename ResultType>
 struct Job
@@ -113,11 +118,11 @@ struct Job
 	char padding[64 - (sizeof(future) - sizeof(progress)) % 64] = {};  // NOLINT
 
 	Job() = delete;
-	Job(Job const&) = delete;
-	Job(Job&& cj) noexcept : future(std::move(cj.future)), progress(cj.progress) {}
+	Job(Job const&) = default;
+	Job(Job&& j) noexcept : Job(std::move(j.future), j.progress) {};
 	Job(QFuture<ResultType>&& f, const Progress& p) noexcept : future(std::move(f)), progress(p) {}
 	Job& operator=(Job const&) = delete;
-	Job& operator=(Job&& job) noexcept { future = std::move(job.future); progress = job.progress; }
+	Job& operator=(Job&& job) = delete;
 	~Job() = default;
 };
 

3rd-party/cove/libvectorizer/Polygons.cpp

@@ -25,9 +25,8 @@
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
-#include <iosfwd>
 #include <limits>
-#include <memory>
+// IWYU pragma: no_include <memory>
 #include <stdexcept>
 #include <utility>
 
@@ -50,7 +49,6 @@ do                                       \
 	if (JOIN_DEBUG) qDebug(__VA_ARGS__); \
 } while (0)
 
-using namespace std;
 
 namespace cove {
 const int Polygons::NPOINTS_MAX = 350;
@@ -379,9 +377,12 @@ Polygons::decomposeImageIntoPaths(const QImage& sourceImage,
 	bool cancel = false;
 	while (!cancel && findNextPixel(image, x, y))
 	{
-		Path pathFound = recordPath(image, x, y);
-		removePathFromImage(image, pathFound);
-		if (pathFound.size() > specklesize) pathList.push_back(pathFound);
+		{
+			auto pathFound = recordPath(image, x, y);
+			removePathFromImage(image, pathFound);
+			if (pathFound.size() > specklesize)
+				pathList.push_back(std::move(pathFound));
+		}
 		if (progressObserver && !(y % progressHowOften))
 		{
 			// FIXME hardcoded value 25!!!
@@ -390,7 +391,10 @@ Polygons::decomposeImageIntoPaths(const QImage& sourceImage,
 		}
 	}
 
-	return !cancel ? pathList : PathList();
+	if (cancel)
+		pathList.clear();
+
+	return pathList;
 }
 
 /*! Identifies straight segments of path and returns them as list of vertices
@@ -418,7 +422,7 @@ Polygons::getPathPolygons(const Polygons::PathList& constpaths,
 		p = path_new();
 		if (!p || !pt)
 		{
-			throw runtime_error("memory allocation failed");
+			throw std::runtime_error("memory allocation failed");
 		}
 		privpath_t* pp = p->priv;
 		pp->pt = pt;
@@ -656,21 +660,19 @@ bool Polygons::splitlist(JOINENDPOINTLIST& pl, JOINOPLIST& ops,
 	if (vertical)
 	{
 		double x1bound = max1.x + maxdist / 2, x2bound = min2.x - maxdist / 2;
-		for (JOINENDPOINTLIST::const_iterator i = pl.begin(); i != pl.end();
-			 ++i)
+		for (const auto& p : pl)
 		{
-			if (i->coords.x <= x1bound) pl1.push_back(*i);
-			if (i->coords.x >= x2bound) pl2.push_back(*i);
+			if (p.coords.x <= x1bound) pl1.push_back(p);
+			if (p.coords.x >= x2bound) pl2.push_back(p);
 		}
 	}
 	else
 	{
 		double y1bound = max1.y + maxdist / 2, y2bound = min2.y - maxdist / 2;
-		for (JOINENDPOINTLIST::const_iterator i = pl.begin(); i != pl.end();
-			 ++i)
+		for (const auto& p : pl)
 		{
-			if (i->coords.y <= y1bound) pl1.push_back(*i);
-			if (i->coords.y >= y2bound) pl2.push_back(*i);
+			if (p.coords.y <= y1bound) pl1.push_back(p);
+			if (p.coords.y >= y2bound) pl2.push_back(p);
 		}
 	}
 
@@ -707,8 +709,8 @@ bool Polygons::compdists(JOINENDPOINTLIST& pl, JOINOPLIST& ops,
 	else
 	{
 		double maxDistSqr = maxdist * maxdist;
-		vector<bool> alreadyUsed(npoints, false);
-		vector<bool>::iterator ai = alreadyUsed.begin(), aj;
+		std::vector<bool> alreadyUsed(npoints, false);
+		std::vector<bool>::iterator ai = alreadyUsed.begin(), aj;
 
 		JOIN_DEBUG_PRINT("computing set of %d points", npoints);
 		for (JOINENDPOINTLIST::const_iterator i = pl.begin();
@@ -745,7 +747,7 @@ bool Polygons::compdists(JOINENDPOINTLIST& pl, JOINOPLIST& ops,
 						a = b - 1;
 						break;
 					default:
-						throw logic_error("NOEND in JOINENDPOINT list");
+						throw std::logic_error("NOEND in JOINENDPOINT list");
 					}
 					switch (j->end)
 					{
@@ -758,7 +760,7 @@ bool Polygons::compdists(JOINENDPOINTLIST& pl, JOINOPLIST& ops,
 						d = c - 1;
 						break;
 					default:
-						throw logic_error("NOEND in JOINENDPOINT list");
+						throw std::logic_error("NOEND in JOINENDPOINT list");
 					}
 
 					ops.push_back(JOINOP(float(dstfun(a, b, c, d)
@@ -826,7 +828,8 @@ bool Polygons::joinPolygons(path_t*& plist,
 
 	compdists(pointlist, ops, min, max, true, progressObserver, 50, 12);
 
-	sort(ops.begin(), ops.end(), greater_weight());
+	sort(ops.begin(), ops.end(), 
+	     [](const JOINOP& x, const JOINOP& y) { return x.weight > y.weight; });
 
 	nops = ops.size();
 	cntr = 0;
@@ -1005,17 +1008,17 @@ bool Polygons::joinPolygons(path_t*& plist,
 				newcurve.vertex[d] = a_curve->vertex[d];
 			break;
 		case NOJOIN:
-			throw logic_error("NOJOIN operation in JOINOP list");
+			throw std::logic_error("NOJOIN operation in JOINOP list");
 		default:
-			throw logic_error("invalid JOINOP");
+			throw std::logic_error("invalid JOINOP");
 		}
 
 		privcurve_free_members(a_curve);
 		memcpy(a_curve, &newcurve, sizeof(privcurve_t));
 
 		path_t* ib = currOp.b;
 		list_unlink(path_t, plist, ib);
-		if (!ib) throw logic_error("unlinked ib not in list");
+		if (!ib) throw std::logic_error("unlinked ib not in list");
 		path_free(ib);
 	}
 

3rd-party/cove/libvectorizer/Polygons.h

@@ -21,8 +21,6 @@
 #ifndef COVE_POLYGONS_H
 #define COVE_POLYGONS_H
 
-#include <algorithm>
-#include <functional>
 #include <limits>
 #include <vector>
 
@@ -143,15 +141,6 @@ class Polygons
 
 	typedef std::vector<JOINENDPOINT> JOINENDPOINTLIST;
 
-	struct greater_weight
-		: public std::binary_function<const JOINOP&, const JOINOP&, bool>
-	{
-		bool operator()(const JOINOP& x, const JOINOP& y)
-		{
-			return x.weight > y.weight;
-		}
-	};
-
 	// implementation dependent value...
 	static const int NPOINTS_MAX;
 

3rd-party/cove/libvectorizer/Vectorizer.cpp

@@ -301,7 +301,7 @@ void Vectorizer::setInitColors(const std::vector<QRgb>& initColors)
 	}
 }
 
-/*! Runs classfication.  The progress observer is called during work if set.
+/*! Runs classification.  The progress observer is called during work if set.
  * \param[in] progressObserver Pointer to class implementing ProgressObserver.
  * In case it is null pointer no calls take place.
  */

3rd-party/cove/potrace/trace.c

@@ -564,6 +564,7 @@ int bestpolygon(privpath_t *pp)
   SAFE_MALLOC(seg0, n+1, int);
   SAFE_MALLOC(seg1, n+1, int);
 
+if (n > 2) {
   /* calculate clipped paths */
   if(pp->closed) {
     for (i=0; i<n; i++) {
@@ -649,6 +650,13 @@ int bestpolygon(privpath_t *pp)
   }
   if(!pp->closed)
     pp->po[m-1] = n-1;
+} else {
+  // n <= 2, shouldn't occur after despeckling
+  pp->m = 2;
+  SAFE_MALLOC(pp->po, 2, int);
+  pp->po[0] = 0;
+  pp->po[1] = n-1;
+}
 
   free(pen);
   free(prev);

3rd-party/cove/tests/CMakeLists.txt

@@ -1,7 +1,3 @@
-cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
-
-# project(CoveTests)
-
 find_package(Qt5Core ${Qt5Core_VERSION} REQUIRED)
 find_package(Qt5Gui ${Qt5Core_VERSION} REQUIRED)
 find_package(Qt5Test ${Qt5Core_VERSION} REQUIRED)
@@ -38,6 +34,9 @@ add_test(
 add_executable(cove-PolygonBenchmark EXCLUDE_FROM_ALL
   PolygonTest.cpp
 )
+target_link_libraries(cove-PolygonBenchmark
+  PRIVATE cove-test-config
+)
 target_compile_definitions(cove-PolygonBenchmark
   PRIVATE
     COVE_BENCHMARK=QBENCHMARK