Codes Review

Author: nonwill

deploy/cpp_infer/include/utility.h

@@ -61,33 +61,41 @@ class Utility {
   GetRotateCropImage(const cv::Mat &srcimage,
                      const std::vector<std::vector<int>> &box) noexcept;
 
-  static std::vector<int> argsort(const std::vector<float> &array) noexcept;
+  static std::vector<size_t> argsort(const std::vector<float> &array) noexcept;
 
   static std::string basename(const std::string &filename) noexcept;
 
-  static bool PathExists(const std::string &path) noexcept;
+  static bool PathExists(const char *path) noexcept;
+  static inline bool PathExists(const std::string &path) noexcept {
+    return PathExists(path.c_str());
+  }
 
-  static void CreateDir(const std::string &path) noexcept;
+  static void CreateDir(const char *path) noexcept;
+  static inline void CreateDir(const std::string &path) noexcept {
+    CreateDir(path.c_str());
+  }
 
   static void
   print_result(const std::vector<OCRPredictResult> &ocr_result) noexcept;
 
-  static cv::Mat crop_image(cv::Mat &img,
+  static cv::Mat crop_image(const cv::Mat &img,
                             const std::vector<int> &area) noexcept;
-  static cv::Mat crop_image(cv::Mat &img,
+  static cv::Mat crop_image(const cv::Mat &img,
                             const std::vector<float> &area) noexcept;
 
-  static void sorted_boxes(std::vector<OCRPredictResult> &ocr_result) noexcept;
+  static void sort_boxes(std::vector<OCRPredictResult> &ocr_result) noexcept;
 
   static std::vector<int>
   xyxyxyxy2xyxy(const std::vector<std::vector<int>> &box) noexcept;
   static std::vector<int> xyxyxyxy2xyxy(const std::vector<int> &box) noexcept;
 
   static float fast_exp(float x) noexcept;
   static std::vector<float>
-  activation_function_softmax(std::vector<float> &src) noexcept;
-  static float iou(std::vector<int> &box1, std::vector<int> &box2) noexcept;
-  static float iou(std::vector<float> &box1, std::vector<float> &box2) noexcept;
+  activation_function_softmax(const std::vector<float> &src) noexcept;
+  static float iou(const std::vector<int> &box1,
+                   const std::vector<int> &box2) noexcept;
+  static float iou(const std::vector<float> &box1,
+                   const std::vector<float> &box2) noexcept;
 
 private:
   static bool comparison_box(const OCRPredictResult &result1,

deploy/cpp_infer/src/ocr_rec.cpp

@@ -37,7 +37,7 @@ void CRNNRecognizer::Run(const std::vector<cv::Mat> &img_list,
   for (size_t i = 0; i < img_num; ++i) {
     width_list.emplace_back(float(img_list[i].cols) / img_list[i].rows);
   }
-  std::vector<int> indices = std::move(Utility::argsort(width_list));
+  std::vector<size_t> indices = std::move(Utility::argsort(width_list));
 
   for (size_t beg_img_no = 0; beg_img_no < img_num;
        beg_img_no += this->rec_batch_num_) {

deploy/cpp_infer/src/paddleocr.cpp

@@ -75,7 +75,7 @@ PPOCR::ocr(const std::vector<cv::Mat> &img_list, bool det, bool rec,
     if (rec) {
       this->rec(img_list, ocr_result);
     }
-    for (int i = 0; i < ocr_result.size(); ++i) {
+    for (size_t i = 0; i < ocr_result.size(); ++i) {
       ocr_results.emplace_back(1, std::move(ocr_result[i]));
     }
   } else {
@@ -130,7 +130,7 @@ void PPOCR::det(const cv::Mat &img,
     ocr_results.emplace_back(std::move(res));
   }
   // sort boex from top to bottom, from left to right
-  Utility::sorted_boxes(ocr_results);
+  Utility::sort_boxes(ocr_results);
   this->time_info_det[0] += det_times[0];
   this->time_info_det[1] += det_times[1];
   this->time_info_det[2] += det_times[2];

deploy/cpp_infer/src/utility.cpp

@@ -190,14 +190,15 @@ Utility::GetRotateCropImage(const cv::Mat &srcimage,
   }
 }
 
-std::vector<int> Utility::argsort(const std::vector<float> &array) noexcept {
-  std::vector<int> array_index(array.size(), 0);
-  for (int i = 0; i < array.size(); ++i)
+std::vector<size_t> Utility::argsort(const std::vector<float> &array) noexcept {
+  std::vector<size_t> array_index(array.size(), 0);
+  for (size_t i = 0; i < array.size(); ++i)
     array_index[i] = i;
 
-  std::sort(
-      array_index.begin(), array_index.end(),
-      [&array](int pos1, int pos2) { return (array[pos1] < array[pos2]); });
+  std::sort(array_index.begin(), array_index.end(),
+            [&array](size_t pos1, size_t pos2) {
+              return (array[pos1] < array[pos2]);
+            });
 
   return array_index;
 }
@@ -237,23 +238,23 @@ std::string Utility::basename(const std::string &filename) noexcept {
   return filename.substr(index + 1, len - index);
 }
 
-bool Utility::PathExists(const std::string &path) noexcept {
+bool Utility::PathExists(const char *path) noexcept {
 #ifdef _WIN32
   struct _stat buffer;
-  return (_stat(path.c_str(), &buffer) == 0);
+  return (_stat(path, &buffer) == 0);
 #else
   struct stat buffer;
-  return (stat(path.c_str(), &buffer) == 0);
+  return (stat(path, &buffer) == 0);
 #endif // !_WIN32
 }
 
-void Utility::CreateDir(const std::string &path) noexcept {
+void Utility::CreateDir(const char *path) noexcept {
 #ifdef _MSC_VER
-  _mkdir(path.c_str());
+  _mkdir(path);
 #elif defined __MINGW32__
-  mkdir(path.c_str());
+  mkdir(path);
 #else
-  mkdir(path.c_str(), 0777);
+  mkdir(path, 0777);
 #endif // !_WIN32
 }
 
@@ -288,7 +289,7 @@ void Utility::print_result(
   }
 }
 
-cv::Mat Utility::crop_image(cv::Mat &img,
+cv::Mat Utility::crop_image(const cv::Mat &img,
                             const std::vector<int> &box) noexcept {
   cv::Mat crop_im = cv::Mat::zeros(box[3] - box[1], box[2] - box[0], 16);
   int crop_x1 = std::max(0, box[0]);
@@ -305,14 +306,14 @@ cv::Mat Utility::crop_image(cv::Mat &img,
   return crop_im;
 }
 
-cv::Mat Utility::crop_image(cv::Mat &img,
+cv::Mat Utility::crop_image(const cv::Mat &img,
                             const std::vector<float> &box) noexcept {
   std::vector<int> box_int = {(int)box[0], (int)box[1], (int)box[2],
                               (int)box[3]};
   return crop_image(img, box_int);
 }
 
-void Utility::sorted_boxes(std::vector<OCRPredictResult> &ocr_result) noexcept {
+void Utility::sort_boxes(std::vector<OCRPredictResult> &ocr_result) noexcept {
   std::sort(ocr_result.begin(), ocr_result.end(), Utility::comparison_box);
   if (ocr_result.size() > 1) {
     for (size_t i = 0; i < ocr_result.size() - 1; ++i) {
@@ -367,7 +368,7 @@ float Utility::fast_exp(float x) noexcept {
 }
 
 std::vector<float>
-Utility::activation_function_softmax(std::vector<float> &src) noexcept {
+Utility::activation_function_softmax(const std::vector<float> &src) noexcept {
   size_t length = src.size();
   std::vector<float> dst;
   dst.resize(length);
@@ -385,7 +386,8 @@ Utility::activation_function_softmax(std::vector<float> &src) noexcept {
   return dst;
 }
 
-float Utility::iou(std::vector<int> &box1, std::vector<int> &box2) noexcept {
+float Utility::iou(const std::vector<int> &box1,
+                   const std::vector<int> &box2) noexcept {
   int area1 = std::max(0, box1[2] - box1[0]) * std::max(0, box1[3] - box1[1]);
   int area2 = std::max(0, box2[2] - box2[0]) * std::max(0, box2[3] - box2[1]);
 
@@ -407,8 +409,8 @@ float Utility::iou(std::vector<int> &box1, std::vector<int> &box2) noexcept {
   }
 }
 
-float Utility::iou(std::vector<float> &box1,
-                   std::vector<float> &box2) noexcept {
+float Utility::iou(const std::vector<float> &box1,
+                   const std::vector<float> &box2) noexcept {
   float area1 = std::max((float)0.0, box1[2] - box1[0]) *
                 std::max((float)0.0, box1[3] - box1[1]);
   float area2 = std::max((float)0.0, box2[2] - box2[0]) *