increases warning levels

TinyTinni · Aug 2, 2024 · f605803 · f605803
1 parent 46968e7
commit f605803
Show file tree

Hide file tree

Showing 14 changed files with 79 additions and 39 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -51,6 +51,12 @@ install(TARGETS FairyCam
 
 set_target_properties(FairyCam PROPERTIES PUBLIC_HEADER "${HEADERS}")
 
+target_compile_options(FairyCam PRIVATE
+     $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
+          -Wall -Wextra -Wconversion -pedantic-errors -Wsign-conversion>
+     $<$<CXX_COMPILER_ID:MSVC>:
+          /W4>)
+
 include(GNUInstallDirs)
 install(TARGETS FairyCam
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

diff --git a/src/DirectoryCamera.hpp b/src/DirectoryCamera.hpp
@@ -30,7 +30,8 @@ class DirectoryCamera
   public:
     DirectoryCamera() : DirectoryCamera(Options{}) {}
     DirectoryCamera(Options opts) : m_opts{std::move(opts)} {}
-    bool open(int idx, int apiPreference, const std::vector<int> &params)
+    bool open([[maybe_unused]] int idx, [[maybe_unused]] int apiPreference,
+              [[maybe_unused]] const std::vector<int> &params)
     {
         if (!std::filesystem::is_directory(m_opts.dir))
             return false;
@@ -51,7 +52,7 @@ class DirectoryCamera
 
         return std::filesystem::exists(m_file);
     }
-    bool retrieve(cv::OutputArray image, int flag = 0)
+    bool retrieve(cv::OutputArray image, [[maybe_unused]] int flag = 0)
     {
         auto mat = cv::imread(m_file.string());
         image.assign(mat);
@@ -66,9 +67,12 @@ class DirectoryCamera
         }
         return retrieve(image);
     }
-    bool set(int propId, double value) { return false; }
-    double get(int propId) const { return -1.0; }
-    void setExceptionMode(bool enable) {}
+    bool set([[maybe_unused]] int propId, [[maybe_unused]] double value)
+    {
+        return false;
+    }
+    double get([[maybe_unused]] int propId) const { return -1.0; }
+    void setExceptionMode([[maybe_unused]] bool enable) {}
     bool getExceptionMode() const { return false; }
     DirectoryCamera &operator>>(CV_OUT cv::Mat &image)
     {

diff --git a/src/DirectoryTriggerCamera.cpp b/src/DirectoryTriggerCamera.cpp
@@ -42,8 +42,9 @@ DirectoryTriggerCamera::DirectoryTriggerCamera(Options opts)
 
 DirectoryTriggerCamera::~DirectoryTriggerCamera() { release(); }
 
-bool DirectoryTriggerCamera::open(int idx, int apiPreference,
-                                  const std::vector<int> &params)
+bool DirectoryTriggerCamera::open(
+    [[maybe_unused]] int idx, [[maybe_unused]] int apiPreference,
+    [[maybe_unused]] const std::vector<int> &params)
 {
     if (!std::filesystem::is_directory(d->m_opts.dir))
         return false;
@@ -79,7 +80,8 @@ bool DirectoryTriggerCamera::grab()
     return d->m_msg != nullptr;
 }
 
-bool DirectoryTriggerCamera::retrieve(cv::OutputArray image, int flag)
+bool DirectoryTriggerCamera::retrieve(cv::OutputArray image,
+                                      [[maybe_unused]] int flag)
 {
     if (!isOpened())
         return false;

diff --git a/src/DirectoryTriggerCamera.hpp b/src/DirectoryTriggerCamera.hpp
@@ -24,9 +24,12 @@ class DirectoryTriggerCamera
     bool grab();
     bool retrieve(cv::OutputArray image, int flag = 0);
     bool read(cv::OutputArray image);
-    bool set(int propId, double value) { return false; }
-    double get(int propId) const { return -1.0; }
-    void setExceptionMode(bool enable) {}
+    bool set([[maybe_unused]] int propId, [[maybe_unused]] double value)
+    {
+        return false;
+    }
+    double get([[maybe_unused]] int propId) const { return -1.0; }
+    void setExceptionMode([[maybe_unused]] bool enable) {}
     bool getExceptionMode() const { return false; }
     DirectoryTriggerCamera &operator>>(cv::Mat &image)
     {

diff --git a/src/FileCamera.cpp b/src/FileCamera.cpp
@@ -21,7 +21,7 @@ bool FileCamera::grab()
     return std::filesystem::exists(*m_current);
 }
 
-bool FileCamera::retrieve(cv::OutputArray image, int flag)
+bool FileCamera::retrieve(cv::OutputArray image, [[maybe_unused]] int flag)
 {
     if (!m_is_open || m_current == m_opts.files.cend())
         return false;

diff --git a/src/FileCamera.hpp b/src/FileCamera.hpp
@@ -31,7 +31,8 @@ class FileCamera
           m_next{m_opts.files.cend()}
     {
     }
-    bool open(int idx, int apiPreference, const std::vector<int> &params)
+    bool open([[maybe_unused]] int idx, [[maybe_unused]] int apiPreference,
+              [[maybe_unused]] const std::vector<int> &params)
     {
         m_is_open = true;
         m_next = m_opts.files.cbegin();
@@ -47,9 +48,12 @@ class FileCamera
     bool grab();
     bool retrieve(cv::OutputArray image, int flag = 0);
     bool read(cv::OutputArray image);
-    bool set(int propId, double value) { return false; }
-    double get(int propId) const { return -1.0; }
-    void setExceptionMode(bool enable) {}
+    bool set([[maybe_unused]] int propId, [[maybe_unused]] double value)
+    {
+        return false;
+    }
+    double get([[maybe_unused]] int propId) const { return -1.0; }
+    void setExceptionMode([[maybe_unused]] bool enable) {}
     bool getExceptionMode() const { return false; }
     FileCamera &operator>>(CV_OUT cv::Mat &image)
     {

diff --git a/src/HttpCamera.cpp b/src/HttpCamera.cpp
@@ -122,8 +122,9 @@ HttpCamera::HttpCamera(Options opts) : d(std::make_unique<Impl>(opts)) {}
 
 HttpCamera::~HttpCamera() { release(); }
 
-bool HttpCamera::open(int idx, int apiPreference,
-                      const std::vector<int> &params)
+bool HttpCamera::open([[maybe_unused]] int idx,
+                      [[maybe_unused]] int apiPreference,
+                      [[maybe_unused]] const std::vector<int> &params)
 {
     d->m_srv.start();
     d->m_started = true;
@@ -151,7 +152,7 @@ bool HttpCamera::grab()
     return d->m_msg != nullptr;
 }
 
-bool HttpCamera::retrieve(cv::OutputArray image, int flag)
+bool HttpCamera::retrieve(cv::OutputArray image, [[maybe_unused]] int flag)
 {
     if (d->m_msg == nullptr)
         return false;

diff --git a/src/HttpCamera.hpp b/src/HttpCamera.hpp
@@ -12,7 +12,7 @@ class HttpCamera
   public:
     struct Options
     {
-        uint32_t port = 5001;
+        uint16_t port = 5001;
         int grabTimeOutMs = 10000;
     };
 
@@ -25,9 +25,12 @@ class HttpCamera
     bool grab();
     bool retrieve(cv::OutputArray image, int flag = 0);
     bool read(cv::OutputArray image);
-    bool set(int propId, double value) { return false; }
-    double get(int propId) const noexcept { return -1.0; }
-    void setExceptionMode(bool enable) {}
+    bool set([[maybe_unused]] int propId, [[maybe_unused]] double value)
+    {
+        return false;
+    }
+    double get([[maybe_unused]] int propId) const noexcept { return -1.0; }
+    void setExceptionMode([[maybe_unused]] bool enable) {}
     bool getExceptionMode() const noexcept { return false; }
     HttpCamera &operator>>(cv::Mat &image)
     {

diff --git a/src/MemoryCamera.cpp b/src/MemoryCamera.cpp
@@ -21,7 +21,7 @@ bool MemoryCamera::grab()
     return !m_current->empty();
 }
 
-bool MemoryCamera::retrieve(cv::OutputArray image, int flag)
+bool MemoryCamera::retrieve(cv::OutputArray image,[[maybe_unused]] int flag)
 {
     if (!m_is_open || m_current == m_opts.images.cend())
         return false;

diff --git a/src/MemoryCamera.hpp b/src/MemoryCamera.hpp
@@ -31,7 +31,8 @@ class MemoryCamera
           m_next{m_opts.images.cend()}
     {
     }
-    bool open(int idx, int apiPreference, const std::vector<int> &params)
+    bool open([[maybe_unused]] int idx, [[maybe_unused]] int apiPreference,
+              [[maybe_unused]] const std::vector<int> &params)
     {
         m_is_open = true;
         m_next = m_opts.images.cbegin();
@@ -47,9 +48,12 @@ class MemoryCamera
     bool grab();
     bool retrieve(cv::OutputArray image, int flag = 0);
     bool read(cv::OutputArray image);
-    bool set(int propId, double value) { return false; }
-    double get(int propId) const { return -1.0; }
-    void setExceptionMode(bool enable) {}
+    bool set([[maybe_unused]] int propId, [[maybe_unused]] double value)
+    {
+        return false;
+    }
+    double get([[maybe_unused]] int propId) const { return -1.0; }
+    void setExceptionMode([[maybe_unused]] bool enable) {}
     bool getExceptionMode() const { return false; }
     MemoryCamera &operator>>(CV_OUT cv::Mat &image)
     {

diff --git a/src/chaos/BernoulliSequence.hpp b/src/chaos/BernoulliSequence.hpp
@@ -60,7 +60,7 @@ class BernoulliSequence : public Sequence
     {
     }
 
-    BernoulliSequence(int seed, Options opts)
+    BernoulliSequence(unsigned seed, Options opts)
         : m_is_open{std::move(opts.isOpen)},
           m_retrieve{std::move(opts.retrieve)}, m_grab{std::move(opts.grab)}
     {
@@ -74,11 +74,11 @@ class BernoulliSequence : public Sequence
   private:
     struct Probas
     {
-        std::binomial_distribution<> fail;
-        std::discrete_distribution<> exception_distribution;
+        std::binomial_distribution<unsigned> fail;
+        std::discrete_distribution<unsigned> exception_distribution;
         std::vector<std::function<void()>> exceptions;
         Probas(Fail &&f)
-            : fail{std::binomial_distribution<>{1, f.probability}},
+            : fail{std::binomial_distribution<unsigned>{1, f.probability}},
               exception_distribution{std::begin(f.weights),
                                      std::end(f.weights)},
               exceptions{std::move(f.exceptions)}

diff --git a/src/chaos/ChaosCamera.hpp b/src/chaos/ChaosCamera.hpp
@@ -70,7 +70,8 @@ class ChaosCamera
           m_error_sequence{std::make_unique<SeqT>(std::move(seq))}
     {
     }
-    bool open(int idx, int apiPreference, const std::vector<int> &params)
+    bool open([[maybe_unused]] int idx, [[maybe_unused]] int apiPreference,
+              [[maybe_unused]] const std::vector<int> &params)
     {
         if (!checkIsOpen())
             return false;
@@ -97,7 +98,7 @@ class ChaosCamera
         }
         return true;
     }
-    bool retrieve(cv::OutputArray image, int flag = 0)
+    bool retrieve(cv::OutputArray image, [[maybe_unused]] int flag = 0)
     {
         if (!isOpened())
             return false;
@@ -117,9 +118,15 @@ class ChaosCamera
             return false;
         return retrieve(image);
     }
-    bool set(int propId, double value) { return false; }
-    double get(int propId) const { return -1.0; }
-    void setExceptionMode(bool enable) noexcept { m_active_exception = enable; }
+    bool set([[maybe_unused]] int propId, [[maybe_unused]] double value)
+    {
+        return false;
+    }
+    double get([[maybe_unused]] int propId) const { return -1.0; }
+    void setExceptionMode([[maybe_unused]] bool enable) noexcept
+    {
+        m_active_exception = enable;
+    }
     bool getExceptionMode() const noexcept { return m_active_exception; }
     ChaosCamera &operator>>(CV_OUT cv::Mat &image)
     {

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -21,6 +21,12 @@ target_link_libraries(Tests PRIVATE Poco::Foundation Poco::Net doctest FairyCam)
 target_compile_definitions(Tests PRIVATE "TEST_DATA=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
 target_compile_features(Tests PUBLIC cxx_std_20)
 
+target_compile_options(Tests PRIVATE
+     $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
+          -Wall -Wextra -Wconversion -pedantic-errors -Wsign-conversion>
+     $<$<CXX_COMPILER_ID:MSVC>:
+          /W4>)
+
 if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
    target_link_libraries(Tests PUBLIC -fsanitize=address,undefined)
 endif()

diff --git a/tests/HttpCamera.cpp b/tests/HttpCamera.cpp
@@ -14,9 +14,9 @@ import FairyCam;
 
 using namespace FairyCam;
 
-uint getPort()
+uint16_t getPort()
 {
-    static uint port = 5000;
+    static uint16_t port = 5000;
     return port++;
 }