alter cpp NormalizeImage

Author: ghostxsl

deploy/cpp/include/preprocess_op.h

@@ -65,7 +65,8 @@ class NormalizeImage : public PreprocessOp {
   virtual void Init(const YAML::Node& item) {
     mean_ = item["mean"].as<std::vector<float>>();
     scale_ = item["std"].as<std::vector<float>>();
-    is_scale_ = item["is_scale"].as<bool>();
+    if (item["is_scale"]) is_scale_ = item["is_scale"].as<bool>();
+    if (item["norm_type"]) norm_type_ = item["norm_type"].as<std::string>();
   }
 
   virtual void Run(cv::Mat* im, ImageBlob* data);
@@ -75,6 +76,7 @@ class NormalizeImage : public PreprocessOp {
   std::vector<float> mean_;
   std::vector<float> scale_;
   bool is_scale_ = true;
+  std::string norm_type_ = "mean_std";
 };
 
 class Permute : public PreprocessOp {

deploy/cpp/src/preprocess_op.cc

@@ -34,14 +34,16 @@ void NormalizeImage::Run(cv::Mat* im, ImageBlob* data) {
     e /= 255.0;
   }
   (*im).convertTo(*im, CV_32FC3, e);
-  for (int h = 0; h < im->rows; h++) {
-    for (int w = 0; w < im->cols; w++) {
-      im->at<cv::Vec3f>(h, w)[0] =
-          (im->at<cv::Vec3f>(h, w)[0] - mean_[0]) / scale_[0];
-      im->at<cv::Vec3f>(h, w)[1] =
-          (im->at<cv::Vec3f>(h, w)[1] - mean_[1]) / scale_[1];
-      im->at<cv::Vec3f>(h, w)[2] =
-          (im->at<cv::Vec3f>(h, w)[2] - mean_[2]) / scale_[2];
+  if (norm_type_ == "mean_std"){
+    for (int h = 0; h < im->rows; h++) {
+      for (int w = 0; w < im->cols; w++) {
+        im->at<cv::Vec3f>(h, w)[0] =
+            (im->at<cv::Vec3f>(h, w)[0] - mean_[0]) / scale_[0];
+        im->at<cv::Vec3f>(h, w)[1] =
+            (im->at<cv::Vec3f>(h, w)[1] - mean_[1]) / scale_[1];
+        im->at<cv::Vec3f>(h, w)[2] =
+            (im->at<cv::Vec3f>(h, w)[2] - mean_[2]) / scale_[2];
+      }
     }
   }
 }