From 6420a76b374b6ec195adfa8ce57164cd3c0662f0 Mon Sep 17 00:00:00 2001
From: LDOUBLEV <liuvv0203@outlook.com>
Date: Wed, 8 Jul 2020 12:02:56 +0800
Subject: [PATCH] fix clipper use

---
 deploy/lite/db_post_process.h | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/deploy/lite/db_post_process.h b/deploy/lite/db_post_process.h
index 20710af2..06dbcb2c 100644
--- a/deploy/lite/db_post_process.h
+++ b/deploy/lite/db_post_process.h
@@ -20,22 +20,22 @@
 #include <map>
 #include <vector>
 
+#include "clipper.hpp"
 #include "opencv2/core.hpp"
 #include "opencv2/imgcodecs.hpp"
 #include "opencv2/imgproc.hpp"
-#include "utils/clipper.hpp"
 
-template <class T>
-T clamp(T x, T min, T max) {
-  if (x > max) return max;
-  if (x < min) return min;
+template <class T> T clamp(T x, T min, T max) {
+  if (x > max)
+    return max;
+  if (x < min)
+    return min;
   return x;
 }
 
 std::vector<std::vector<float>> Mat2Vector(cv::Mat mat);
 
-void GetContourArea(std::vector<std::vector<float>> box,
-                    float unclip_ratio,
+void GetContourArea(std::vector<std::vector<float>> box, float unclip_ratio,
                     float &distance);
 
 cv::RotatedRect Unclip(std::vector<std::vector<float>> box, float unclip_ratio);
@@ -46,20 +46,17 @@ bool XsortFp32(std::vector<float> a, std::vector<float> b);
 
 bool XsortInt(std::vector<int> a, std::vector<int> b);
 
-std::vector<std::vector<int>> OrderPointsClockwise(
-    std::vector<std::vector<int>> pts);
+std::vector<std::vector<int>>
+OrderPointsClockwise(std::vector<std::vector<int>> pts);
 
 std::vector<std::vector<float>> GetMiniBoxes(cv::RotatedRect box, float &ssid);
 
 float BoxScoreFast(std::vector<std::vector<float>> box_array, cv::Mat pred);
 
-std::vector<std::vector<std::vector<int>>> BoxesFromBitmap(
-    const cv::Mat pred,
-    const cv::Mat bitmap,
-    std::map<std::string, double> Config);
+std::vector<std::vector<std::vector<int>>>
+BoxesFromBitmap(const cv::Mat pred, const cv::Mat bitmap,
+                std::map<std::string, double> Config);
 
-std::vector<std::vector<std::vector<int>>> FilterTagDetRes(
-    std::vector<std::vector<std::vector<int>>> boxes,
-    float ratio_h,
-    float ratio_w,
-    cv::Mat srcimg);
+std::vector<std::vector<std::vector<int>>>
+FilterTagDetRes(std::vector<std::vector<std::vector<int>>> boxes, float ratio_h,
+                float ratio_w, cv::Mat srcimg);
-- 
GitLab