Merge pull request #7 from derpda/patch-1

Standard library header include fixes
Vertical-Beach · Jul 17, 2022 · d032036 · d032036
2 parents 0f78ed7 + 0d6d550
commit d032036
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 30 deletions.
diff --git a/include/ByteTrack/BYTETracker.h b/include/ByteTrack/BYTETracker.h
@@ -1,11 +1,14 @@
 #pragma once
 
+#include "ByteTrack/STrack.h"
+#include "ByteTrack/lapjv.h"
+#include "ByteTrack/Object.h"
+
+#include <cstddef>
+#include <limits>
 #include <map>
 #include <memory>
-
-#include <ByteTrack/STrack.h>
-#include <ByteTrack/lapjv.h>
-#include <ByteTrack/Object.h>
+#include <vector>
 
 namespace byte_track
 {
@@ -53,7 +56,7 @@ class BYTETracker
                      std::vector<int> &rowsol,
                      std::vector<int> &colsol,
                      bool extend_cost = false,
-                     float cost_limit = LONG_MAX,
+                     float cost_limit = std::numeric_limits<float>::max(),
                      bool return_cost = true) const;
 
 private:

diff --git a/include/ByteTrack/KalmanFilter.h b/include/ByteTrack/KalmanFilter.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <Eigen/Dense>
+#include "Eigen/Dense"
 
-#include <ByteTrack/Rect.h>
+#include "ByteTrack/Rect.h"
 
 namespace byte_track
 {

diff --git a/include/ByteTrack/Object.h b/include/ByteTrack/Object.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ByteTrack/Rect.h>
+#include "ByteTrack/Rect.h"
 
 namespace byte_track
 {

diff --git a/include/ByteTrack/Rect.h b/include/ByteTrack/Rect.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Eigen/Dense>
+#include "Eigen/Dense"
 
 namespace byte_track
 {

diff --git a/include/ByteTrack/STrack.h b/include/ByteTrack/STrack.h
@@ -1,7 +1,9 @@
 #pragma once
 
-#include <ByteTrack/Rect.h>
-#include <ByteTrack/KalmanFilter.h>
+#include "ByteTrack/Rect.h"
+#include "ByteTrack/KalmanFilter.h"
+
+#include <cstddef>
 
 namespace byte_track
 {

diff --git a/include/ByteTrack/lapjv.h b/include/ByteTrack/lapjv.h
@@ -1,10 +1,6 @@
 #pragma once
 
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-
-#include <iostream>
+#include <cstddef>
 
 namespace byte_track
 {

diff --git a/src/BYTETracker.cpp b/src/BYTETracker.cpp
@@ -1,4 +1,12 @@
-#include <ByteTrack/BYTETracker.h>
+#include "ByteTrack/BYTETracker.h"
+
+#include <cstddef>
+#include <limits>
+#include <map>
+#include <memory>
+#include <stdexcept>
+#include <utility>
+#include <vector>
 
 byte_track::BYTETracker::BYTETracker(const int& frame_rate,
                                      const int& track_buffer,
@@ -450,14 +458,14 @@ double byte_track::BYTETracker::execLapjv(const std::vector<std::vector<float>>
         }
     }
 
-    if (extend_cost || cost_limit < LONG_MAX)
+    if (extend_cost || cost_limit < std::numeric_limits<float>::max())
     {
         n = n_rows + n_cols;
         cost_c_extended.resize(n);
         for (size_t i = 0; i < cost_c_extended.size(); i++)
             cost_c_extended[i].resize(n);
 
-        if (cost_limit < LONG_MAX)
+        if (cost_limit < std::numeric_limits<float>::max())
         {
             for (size_t i = 0; i < cost_c_extended.size(); i++)
             {

diff --git a/src/KalmanFilter.cpp b/src/KalmanFilter.cpp
@@ -1,4 +1,6 @@
-#include <ByteTrack/KalmanFilter.h>
+#include "ByteTrack/KalmanFilter.h"
+
+#include <cstddef>
 
 byte_track::KalmanFilter::KalmanFilter(const float& std_weight_position,
                                        const float& std_weight_velocity) :

diff --git a/src/Object.cpp b/src/Object.cpp
@@ -1,4 +1,4 @@
-#include <ByteTrack/Object.h>
+#include "ByteTrack/Object.h"
 
 byte_track::Object::Object(const Rect<float> &_rect,
                            const int &_label,

diff --git a/src/Rect.cpp b/src/Rect.cpp
@@ -1,4 +1,6 @@
-#include <ByteTrack/Rect.h>
+#include "ByteTrack/Rect.h"
+
+#include <algorithm>
 
 template <typename T>
 byte_track::Rect<T>::Rect(const T &x, const T &y, const T &width, const T &height) :

diff --git a/src/STrack.cpp b/src/STrack.cpp
@@ -1,4 +1,6 @@
-#include <ByteTrack/STrack.h>
+#include "ByteTrack/STrack.h"
+
+#include <cstddef>
 
 byte_track::STrack::STrack(const Rect<float>& rect, const float& score) :
     kalman_filter_(),

diff --git a/src/lapjv.cpp b/src/lapjv.cpp
@@ -1,4 +1,8 @@
-#include <ByteTrack/lapjv.h>
+#include "ByteTrack/lapjv.h"
+
+#include <cstddef>
+#include <cstring>
+#include <stdexcept>
 
 #define LAPJV_CPP_NEW(x, t, n) if ((x = (t *)malloc(sizeof(t) * (n))) == 0) { return -1; }
 #define LAPJV_CPP_FREE(x) if (x != 0) { free(x); x = 0; }

diff --git a/test/test_BYTETracker.cpp b/test/test_BYTETracker.cpp
@@ -1,11 +1,13 @@
-#include <ByteTrack/BYTETracker.h>
+#include "ByteTrack/BYTETracker.h"
 
-#include <gtest/gtest.h>
+#include "gtest/gtest.h"
 
-#include <boost/property_tree/ptree.hpp>
-#include <boost/property_tree/json_parser.hpp>
-#include <boost/foreach.hpp>
-#include <boost/optional.hpp>
+#include "boost/property_tree/ptree.hpp"
+#include "boost/property_tree/json_parser.hpp"
+#include "boost/foreach.hpp"
+#include "boost/optional.hpp"
+
+#include <cstddef>
 
 namespace
 {