Enable compilation with Qt6 and MSVC

Add missing headers, account for the different target path, change the Qt binary dir determination method.
4lex4 · Feb 25, 2022 · 4df65ca · 4df65ca
1 parent a4c655f
commit 4df65ca
Show file tree

Hide file tree

Showing 35 changed files with 72 additions and 29 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -210,14 +210,15 @@ find_package(
     Qt6
     COMPONENTS Core Gui Widgets Xml Network LinguistTools OpenGL Svg OpenGLWidgets
     CONFIG)
-if (NOT Qt6_FOUND)
+if (Qt6_FOUND)
+    set(QT_BINDIR "${QT6_INSTALL_PREFIX}/bin")
+else()
   find_package(Qt5 ${qt_min_version}
     COMPONENTS Core Gui Widgets Xml Network LinguistTools OpenGL Svg
     CONFIG REQUIRED)
+    set(QT_BINDIR "${QT5_INSTALL_PREFIX}/bin")
 endif()
 
-get_filename_component(QT_BINDIR ${QT_QMAKE_EXECUTABLE} DIRECTORY)
-
 if(Qt6_FOUND)
   set(Qt_Core_lib Qt::Core)
   set(Qt_Gui_lib Qt::Gui)

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -84,7 +84,7 @@ if (Qt6_FOUND AND WIN32)
   add_custom_command(
     TARGET scantailor
     POST_BUILD
-    COMMAND ${QT_BINDIR}/windeployqt ${CMAKE_BINARY_DIR}
+    COMMAND ${QT_BINDIR}/windeployqt  $<TARGET_FILE_DIR:scantailor>
     COMMENT "deploy qt files alongside binary (e.g. plugins)"
   )
   install(CODE "execute_process(COMMAND ${QT_BINDIR}/windeployqt ${CMAKE_INSTALL_PREFIX})")

diff --git a/src/core/BlackOnWhiteEstimator.cpp b/src/core/BlackOnWhiteEstimator.cpp
@@ -3,6 +3,8 @@
 
 #include "BlackOnWhiteEstimator.h"
 
+#include <stdexcept>
+
 #include <imageproc/Binarize.h>
 #include <imageproc/Grayscale.h>
 #include <imageproc/Morphology.h>

diff --git a/src/core/filters/output/OutputGenerator.cpp b/src/core/filters/output/OutputGenerator.cpp
@@ -49,6 +49,7 @@
 #include <boost/bind/bind.hpp>
 #include <boost/function.hpp>
 #include <cmath>
+#include <stdexcept>
 
 #include "ColorParams.h"
 #include "DebugImages.h"

diff --git a/src/core/filters/output/OutputImageBuilder.cpp b/src/core/filters/output/OutputImageBuilder.cpp
@@ -3,6 +3,8 @@
 
 #include "OutputImageBuilder.h"
 
+#include <stdexcept>
+
 #include <imageproc/BinaryImage.h>
 
 #include "ForegroundType.h"
@@ -69,4 +71,4 @@ OutputImageBuilder& OutputImageBuilder::setForegroundType(const ForegroundType&
   m_foregroundType = std::make_unique<ForegroundType>(foregroundImage);
   return *this;
 }
-}  // namespace output
+}  // namespace output
diff --git a/src/dewarping/RasterDewarper.cpp b/src/dewarping/RasterDewarper.cpp
@@ -8,6 +8,7 @@
 
 #include <QDebug>
 #include <cmath>
+#include <stdexcept>
 
 #include "CylindricalSurfaceDewarper.h"
 
@@ -527,4 +528,4 @@ QImage RasterDewarper::dewarp(const QImage& src,
     return dewarpRgb(src.convertToFormat(QImage::Format_RGB32), dstSize, distortionModel, modelDomain, bgColor);
   }
 }  // RasterDewarper::dewarp
-}  // namespace dewarping
+}  // namespace dewarping
diff --git a/src/imageproc/AdjustBrightness.cpp b/src/imageproc/AdjustBrightness.cpp
@@ -4,6 +4,7 @@
 #include "AdjustBrightness.h"
 
 #include <QImage>
+#include <stdexcept>
 
 namespace imageproc {
 void adjustBrightness(QImage& rgbImage, const QImage& brightness, const double wr, const double wb) {
@@ -73,4 +74,4 @@ void adjustBrightnessYUV(QImage& rgbImage, const QImage& brightness) {
 void adjustBrightnessGrayscale(QImage& rgbImage, const QImage& brightness) {
   adjustBrightness(rgbImage, brightness, 11.0 / 32.0, 5.0 / 32.0);
 }
-}  // namespace imageproc
+}  // namespace imageproc
diff --git a/src/imageproc/BackgroundColorCalculator.cpp b/src/imageproc/BackgroundColorCalculator.cpp
@@ -4,6 +4,7 @@
 #include "BackgroundColorCalculator.h"
 
 #include <cassert>
+#include <stdexcept>
 
 #include "Binarize.h"
 #include "BinaryImage.h"
@@ -197,4 +198,4 @@ QColor BackgroundColorCalculator::calcDominantColor(const QImage& img, const Bin
     return QColor(dominantRed, dominantGreen, dominantBlue);
   }
 }
-}  // namespace imageproc
+}  // namespace imageproc
diff --git a/src/imageproc/Binarize.cpp b/src/imageproc/Binarize.cpp
@@ -6,6 +6,7 @@
 #include <QDebug>
 #include <cassert>
 #include <cmath>
+#include <stdexcept>
 
 #include "BinaryImage.h"
 #include "Grayscale.h"
@@ -199,4 +200,4 @@ BinaryImage binarizeWolf(const QImage& src,
 BinaryImage peakThreshold(const QImage& image) {
   return BinaryImage(image, BinaryThreshold::peakThreshold(image));
 }
-}  // namespace imageproc
+}  // namespace imageproc
diff --git a/src/imageproc/BinaryImage.cpp b/src/imageproc/BinaryImage.cpp
@@ -1051,4 +1051,4 @@ void* BinaryImage::SharedData::operator new(size_t, const NumWords numWords) {
 void BinaryImage::SharedData::operator delete(void* addr, NumWords) {
   free(addr);
 }
-}  // namespace imageproc
+}  // namespace imageproc
diff --git a/src/imageproc/BinaryThreshold.cpp b/src/imageproc/BinaryThreshold.cpp
@@ -6,6 +6,7 @@
 #include <QDebug>
 #include <cassert>
 #include <iostream>
+#include <stdexcept>
 
 #include "Grayscale.h"
 #include "Morphology.h"
@@ -171,4 +172,4 @@ BinaryThreshold BinaryThreshold::mokjiThreshold(const QImage& image,
   const double threshold = 0.5 * nominator / denominator;
   return BinaryThreshold((int) (threshold + 0.5));
 }  // BinaryThreshold::mokjiThreshold
-}  // namespace imageproc
+}  // namespace imageproc
diff --git a/src/imageproc/ColorSegmenter.cpp b/src/imageproc/ColorSegmenter.cpp
@@ -5,6 +5,7 @@
 
 #include <QImage>
 #include <cmath>
+#include <stdexcept>
 
 #include "BinaryImage.h"
 #include "BinaryThreshold.h"
@@ -404,4 +405,4 @@ GrayImage ColorSegmenter::segment(const BinaryImage& image, const GrayImage& gra
   ConnectivityMap segmentsMap = buildMapFromGrayscale(image);
   return buildGrayImage(segmentsMap, grayImage);
 }
-}  // namespace imageproc
+}  // namespace imageproc
diff --git a/src/imageproc/ConnectivityMap.cpp b/src/imageproc/ConnectivityMap.cpp
@@ -5,6 +5,7 @@
 
 #include <QDebug>
 #include <QImage>
+#include <stdexcept>
 
 #include "BinaryImage.h"
 #include "BitOps.h"
@@ -571,4 +572,4 @@ void ConnectivityMap::remapIds(const std::vector<uint32_t>& map) {
     }
   }
 }
-}  // namespace imageproc
+}  // namespace imageproc
diff --git a/src/imageproc/DrawOver.cpp b/src/imageproc/DrawOver.cpp
@@ -5,6 +5,7 @@
 
 #include <QImage>
 #include <cassert>
+#include <stdexcept>
 
 #include "BinaryImage.h"
 #include "RasterOp.h"
@@ -52,4 +53,4 @@ void drawOver(QImage& dst, const QRect& dstRect, const QImage& src, const QRect&
     srcLine += srcBpl;
   }
 }  // drawOver
-}  // namespace imageproc
+}  // namespace imageproc
diff --git a/src/imageproc/Grayscale.cpp b/src/imageproc/Grayscale.cpp
@@ -3,6 +3,8 @@
 
 #include "Grayscale.h"
 
+#include <stdexcept>
+
 #include "BinaryImage.h"
 #include "BitOps.h"
 
@@ -443,4 +445,4 @@ void GrayscaleHistogram::fromAnyImage(const QImage& img, const BinaryImage& mask
     }
   }
 }
-}  // namespace imageproc
+}  // namespace imageproc
diff --git a/src/imageproc/ImageCombination.cpp b/src/imageproc/ImageCombination.cpp
@@ -1,11 +1,13 @@
 // Copyright (C) 2019  Joseph Artsimovich <[email protected]>, 4lex4 <[email protected]>
 // Use of this source code is governed by the GNU GPLv3 license that can be found in the LICENSE file.
 
+
 #include "ImageCombination.h"
 
 #include <QImage>
 #include <unordered_map>
 #include <unordered_set>
+#include <stdexcept>
 
 #include "BinaryImage.h"
 
@@ -403,4 +405,4 @@ void applyMask(QImage& image, const BinaryImage& bwMask, const BWColor fillingCo
 
   impl::applyMask(image, bwMask, fillingColor);
 }
-}  // namespace imageproc
+}  // namespace imageproc
diff --git a/src/imageproc/InfluenceMap.cpp b/src/imageproc/InfluenceMap.cpp
@@ -4,6 +4,7 @@
 #include "InfluenceMap.h"
 
 #include <QImage>
+#include <stdexcept>
 
 #include "BinaryImage.h"
 #include "BitOps.h"
@@ -254,4 +255,4 @@ QImage InfluenceMap::visualized() const {
   }
   return dst;
 }  // InfluenceMap::visualized
-}  // namespace imageproc
+}  // namespace imageproc
diff --git a/src/imageproc/Morphology.cpp b/src/imageproc/Morphology.cpp
@@ -6,6 +6,7 @@
 #include <QDebug>
 #include <cassert>
 #include <cmath>
+#include <stdexcept>
 
 #include "BinaryImage.h"
 #include "GrayImage.h"
@@ -1110,4 +1111,4 @@ BinaryImage blackTopHatTransform(const BinaryImage& src,
 BinaryImage blackTopHatTransform(const BinaryImage& src, const QSize& brick, BWColor srcSurroundings) {
   return blackTopHatTransform(src, brick, src.rect(), srcSurroundings);
 }
-}  // namespace imageproc
+}  // namespace imageproc
diff --git a/src/imageproc/OrthogonalRotation.cpp b/src/imageproc/OrthogonalRotation.cpp
@@ -3,6 +3,8 @@
 
 #include "OrthogonalRotation.h"
 
+#include <stdexcept>
+
 #include "BinaryImage.h"
 #include "RasterOp.h"
 
@@ -151,4 +153,4 @@ BinaryImage orthogonalRotation(const BinaryImage& src, const QRect& srcRect, con
 BinaryImage orthogonalRotation(const BinaryImage& src, const int degrees) {
   return orthogonalRotation(src, src.rect(), degrees);
 }
-}  // namespace imageproc
+}  // namespace imageproc
diff --git a/src/imageproc/PolygonRasterizer.cpp b/src/imageproc/PolygonRasterizer.cpp
@@ -8,6 +8,7 @@
 #include <QPolygonF>
 #include <boost/foreach.hpp>
 #include <cassert>
+#include <stdexcept>
 
 #include "BinaryImage.h"
 #include "PolygonUtils.h"

diff --git a/src/imageproc/PolynomialSurface.cpp b/src/imageproc/PolynomialSurface.cpp
@@ -1,6 +1,8 @@
 // Copyright (C) 2019  Joseph Artsimovich <[email protected]>, 4lex4 <[email protected]>
 // Use of this source code is governed by the GNU GPLv3 license that can be found in the LICENSE file.
 
+#include <stdexcept>
+
 #include "PolynomialSurface.h"
 
 #include <QDebug>

diff --git a/src/imageproc/Posterizer.cpp b/src/imageproc/Posterizer.cpp
@@ -3,6 +3,7 @@
 
 #include "Posterizer.h"
 
+#include <stdexcept>
 #include <cassert>
 #include <set>
 #include <unordered_set>

diff --git a/src/imageproc/RastLineFinder.cpp b/src/imageproc/RastLineFinder.cpp
@@ -3,6 +3,7 @@
 
 #include "RastLineFinder.h"
 
+#include <stdexcept>
 #include <boost/foreach.hpp>
 #include <cassert>
 #include <cmath>

diff --git a/src/imageproc/RastLineFinder.h b/src/imageproc/RastLineFinder.h
@@ -6,6 +6,7 @@
 
 #include <QLineF>
 #include <QPointF>
+#include <stdexcept>
 #include <cstddef>
 #include <string>
 #include <vector>

diff --git a/src/imageproc/ReduceThreshold.cpp b/src/imageproc/ReduceThreshold.cpp
@@ -3,6 +3,7 @@
 
 #include "ReduceThreshold.h"
 
+#include <stdexcept>
 #include <cassert>
 
 namespace imageproc {
@@ -272,4 +273,4 @@ void ReduceThreshold::reduceVertLine(const int threshold) {
 
   m_image = dst;
 }  // ReduceThreshold::reduceVertLine
-}  // namespace imageproc
+}  // namespace imageproc
diff --git a/src/imageproc/SavGolFilter.cpp b/src/imageproc/SavGolFilter.cpp
@@ -3,6 +3,8 @@
 
 #include "SavGolFilter.h"
 
+#include <stdexcept>
+
 #include "Grayscale.h"
 #include "SavGolKernel.h"
 
@@ -274,4 +276,4 @@ QImage savGolFilter(const QImage& src, const QSize& windowSize, const int horDeg
   }
   return savGolFilterGrayToGray(toGrayscale(src), windowSize, horDegree, vertDegree);
 }
-}  // namespace imageproc
+}  // namespace imageproc
diff --git a/src/imageproc/Scale.cpp b/src/imageproc/Scale.cpp
@@ -3,6 +3,7 @@
 
 #include "Scale.h"
 
+#include <stdexcept>
 #include <cassert>
 
 #include "GrayImage.h"
@@ -355,4 +356,4 @@ GrayImage scaleToGray(const GrayImage& src, const QSize& dstSize) {
   }
   return scaleGrayToGray(src, dstSize);
 }
-}  // namespace imageproc
+}  // namespace imageproc
diff --git a/src/imageproc/SeedFill.cpp b/src/imageproc/SeedFill.cpp
@@ -4,6 +4,7 @@
 #include "SeedFill.h"
 
 #include <QDebug>
+#include <stdexcept>
 
 #include "GrayImage.h"
 #include "SeedFillGeneric.h"
@@ -448,4 +449,4 @@ GrayImage seedFillGraySlow(const GrayImage& seed, const GrayImage& mask, const C
   }
   return img;
 }
-}  // namespace imageproc
+}  // namespace imageproc
diff --git a/src/imageproc/Shear.cpp b/src/imageproc/Shear.cpp
@@ -3,6 +3,7 @@
 
 #include "Shear.h"
 
+#include <stdexcept>
 #include <cassert>
 #include <cmath>
 
@@ -168,4 +169,4 @@ void hShearInPlace(BinaryImage& image, const double shear, const double yOrigin,
 void vShearInPlace(BinaryImage& image, const double shear, const double xOrigin, const BWColor backgroundColor) {
   vShearFromTo(image, image, shear, xOrigin, backgroundColor);
 }
-}  // namespace imageproc
+}  // namespace imageproc