fix: add missing pfld outputs

Seeed-Studio · Nov 26, 2024 · caa5e45 · caa5e45
1 parent dbc6736
commit caa5e45
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/sscma/core/ma_common.h b/sscma/core/ma_common.h
@@ -14,7 +14,7 @@
 #include "ma_exception.h"
 #include "ma_types.h"
 
-#define MA_VERSION           "2024.11.13"
+#define MA_VERSION           "2024.11.25"
 #define MA_VERSION_LENTH_MAX 32
 
 #endif  // MA_COMMON_H
diff --git a/sscma/core/model/ma_model_pfld.cpp b/sscma/core/model/ma_model_pfld.cpp
@@ -1,7 +1,7 @@
 #include "ma_model_pfld.h"
 
 #include <algorithm>
-#include <vector>
+#include <forward_list>
 
 namespace ma::model {
 
@@ -96,11 +96,9 @@ ma_err_t PFLD::postProcessI8() {
         point.score  = 1.0;
         point.target = i / 2;
 
-        results_.push_back(std::move(point));
+        results_.push_front(std::move(point));
     }
 
-    results_.shrink_to_fit();
-
     return MA_OK;
 }
 

diff --git a/sscma/core/model/ma_model_pfld.h b/sscma/core/model/ma_model_pfld.h
@@ -1,8 +1,6 @@
 #ifndef _MA_MODEL_PFLD_
 #define _MA_MODEL_PFLD_
 
-#include <vector>
-
 #include "ma_model_point_detector.h"
 
 namespace ma::model {

diff --git a/sscma/core/model/ma_model_point_detector.cpp b/sscma/core/model/ma_model_point_detector.cpp
@@ -30,7 +30,7 @@ PointDetector::PointDetector(Engine* p_engine, const char* name, ma_model_type_t
 
 PointDetector::~PointDetector() {}
 
-const std::vector<ma_point_t>& PointDetector::getResults() const {
+const std::forward_list<ma_point_t>& PointDetector::getResults() const {
     return results_;
 }
 

diff --git a/sscma/core/model/ma_model_point_detector.h b/sscma/core/model/ma_model_point_detector.h
@@ -1,7 +1,7 @@
 #ifndef _MA_MODEL_POINT_DETECTOR_H_
 #define _MA_MODEL_POINT_DETECTOR_H_
 
-#include <vector>
+#include <forward_list>
 
 #include "ma_model_base.h"
 
@@ -17,7 +17,7 @@ class PointDetector : public Model {
 
     bool is_nhwc_;
 
-    std::vector<ma_point_t> results_;
+    std::forward_list<ma_point_t> results_;
 
 protected:
     ma_err_t preprocess() override;
@@ -26,7 +26,7 @@ class PointDetector : public Model {
     PointDetector(Engine* engine, const char* name, ma_model_type_t type);
     virtual ~PointDetector();
 
-    const std::vector<ma_point_t>& getResults() const;
+    const std::forward_list<ma_point_t>& getResults() const;
 
     ma_err_t run(const ma_img_t* img);