Fix merge dev in feature

sonia-auv · Aug 8, 2021 · 13d1a8b · 13d1a8b
1 parent 5172484
commit 13d1a8b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/src/proc_image_processing/cpu/filters/low_pass/contrast_and_brightness_filter.h b/src/proc_image_processing/cpu/filters/low_pass/contrast_and_brightness_filter.h
@@ -57,7 +57,6 @@ namespace proc_image_processing {
             RangedParameter<double> contrast_, brightness_;
         };
 
-        Parameter<bool> enable_;
         RangedParameter<double> contrast_, brightness_;
     };
 

diff --git a/src/proc_image_processing/cpu/filters/low_pass/white_filter.h b/src/proc_image_processing/cpu/filters/low_pass/white_filter.h
@@ -28,9 +28,6 @@ namespace proc_image_processing {
         ~WhiteFilter() override = default;
 
         void apply(cv::Mat &image) override {
-            if (!enable_()) {
-                return;
-            }
             cv::Scalar min_pixel_range = cv::Scalar(minimal_1pixel_range_(), minimal_2pixel_range_(),
                                                     minimal_3pixel_range_());
             cv::Scalar max_pixel_range = cv::Scalar(maximal_1pixel_range_(), maximal_2pixel_range_(),
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,7 +57,6 @@ namespace proc_image_processing { @@
                 RangedParameter<double> contrast_, brightness_;
             };
-            Parameter<bool> enable_;
             RangedParameter<double> contrast_, brightness_;
         };
@@ Expand Down @@