Pass fewer args to feature map

Author: kornelski

src/classifier/lab_boosted_classifier.rs

@@ -78,9 +78,7 @@ impl LabBoostedClassifier {
     }
 
     pub fn compute(&mut self, image: &ImageData) {
-        self.feature_map
-            .borrow_mut()
-            .compute(image.data(), image.width(), image.height());
+        self.feature_map.borrow_mut().compute(image);
     }
 
     pub fn set_roi(&mut self, roi: Rectangle) {

src/classifier/surf_mlp_classifier.rs

@@ -233,12 +233,10 @@ impl SurfMlpClassifier {
     }
 
     pub fn compute(&mut self, image: &ImageData) {
-        (*self.feature_map)
-            .borrow_mut()
-            .compute(image.data(), image.width(), image.height());
+        self.feature_map.borrow_mut().compute(image);
     }
 
     pub fn set_roi(&mut self, roi: Rectangle) {
-        (*self.feature_map).borrow_mut().set_roi(roi);
+        self.feature_map.borrow_mut().set_roi(roi);
     }
 }

src/feat/lab_boosted_featmap.rs

@@ -16,6 +16,7 @@
 // You should have received a copy of the BSD 2-Clause License along with the software.
 // If not, see < https://opensource.org/licenses/BSD-2-Clause>.
 
+use crate::ImageData;
 use num;
 use num::integer::Integer;
 use num::traits::WrappingAdd;
@@ -39,7 +40,11 @@ pub struct LabBoostedFeatureMap {
 }
 
 impl FeatureMap for LabBoostedFeatureMap {
-    fn compute(&mut self, input: &[u8], width: u32, height: u32) {
+    fn compute(&mut self, image: &ImageData) {
+        let input = image.data();
+        let width = image.width();
+        let height = image.height();
+
         if width == 0 || height == 0 {
             panic!(format!(
                 "Illegal arguments: width ({}), height ({})",

src/feat/mod.rs

@@ -19,12 +19,13 @@
 mod lab_boosted_featmap;
 mod surf_mlp_featmap;
 
+use crate::ImageData;
 pub use self::lab_boosted_featmap::LabBoostedFeatureMap;
 pub use self::surf_mlp_featmap::SurfMlpFeatureMap;
 
 use crate::common::Rectangle;
 
 pub trait FeatureMap {
     fn set_roi(&mut self, roi: Rectangle);
-    fn compute(&mut self, input: &[u8], width: u32, height: u32);
+    fn compute(&mut self, image: &ImageData);
 }

src/feat/surf_mlp_featmap.rs

@@ -16,6 +16,7 @@
 // You should have received a copy of the BSD 2-Clause License along with the software.
 // If not, see < https://opensource.org/licenses/BSD-2-Clause>.
 
+use crate::ImageData;
 use crate::common::{Rectangle, Seq};
 use crate::feat::FeatureMap;
 use crate::math;
@@ -39,7 +40,11 @@ pub struct SurfMlpFeatureMap {
 }
 
 impl FeatureMap for SurfMlpFeatureMap {
-    fn compute(&mut self, input: &[u8], width: u32, height: u32) {
+    fn compute(&mut self, image: &ImageData) {
+        let input = image.data();
+        let width = image.width();
+        let height = image.height();
+
         if width == 0 || height == 0 {
             panic!(format!(
                 "Illegal arguments: width ({}), height ({})",