Merge branch 'master' into build-on-pull-requests

e1f566a1 · Wieland Morgenstern · 0c84746b · 6e40cbaf · e1f566a1 · e1f566a1
Commit e1f566a1 authored Dec 17, 2020 by Wieland Morgenstern
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

cropcircleeditor.cpp .../src/libvideostitch-gui/widgets/crop/cropcircleeditor.cpp +1 -0

croprectangleeditor.cpp ...c/libvideostitch-gui/widgets/crop/croprectangleeditor.cpp +2 -1

No files found.
--- a/apps/src/libvideostitch-gui/widgets/crop/cropcircleeditor.cpp
+++ b/apps/src/libvideostitch-gui/widgets/crop/cropcircleeditor.cpp
@@ -6,6 +6,7 @@
 #include "libvideostitch-gui/mainwindow/vssettings.hpp"
 #include <math.h>
 #include <QPainter>
+#include <QPainterPath>
 #include <QMouseEvent>

 #define PRECISION 0.1f

--- a/apps/src/libvideostitch-gui/widgets/crop/croprectangleeditor.cpp
+++ b/apps/src/libvideostitch-gui/widgets/crop/croprectangleeditor.cpp
@@ -4,6 +4,7 @@
 #include "croprectangleeditor.hpp"
 #include <QMouseEvent>
 #include <QPainter>
+#include <QPainterPath>
 
 CropRectangleEditor::CropRectangleEditor(const QSize thumbnailSize, const QSize frameSize, const Crop &initCrop,
                                         QWidget *const parent)