Changeset 318 in flair-src for trunk/lib/FlairVisionFilter

Timestamp:

Jul 3, 2019, 5:05:33 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

• completely removed cvmatrix
• replaced cvmatrix_descriptor by MatrixDescriptor

Location:

trunk/lib/FlairVisionFilter/src

Files:

• HoughLines.cpp (modified) (1 diff)
• OpticalFlowCompensated.cpp (modified) (1 diff)
• OpticalFlowSpeed.cpp (modified) (1 diff)

trunk/lib/FlairVisionFilter/src/HoughLines.cpp

@@ -44 +44 @@
 
     //init output matrix of same size as init
-    cvmatrix_descriptor* desc=new cvmatrix_descriptor(4,1);
+    MatrixDescriptor* desc=new MatrixDescriptor(4,1);
     desc->SetElementName(0,0,"distance");
     desc->SetElementName(1,0,"orientation rad");

trunk/lib/FlairVisionFilter/src/OpticalFlowCompensated.cpp

@@ -36 +36 @@
 
 OpticalFlowCompensated::OpticalFlowCompensated(const OpticalFlow *parent, const Ahrs *ahrs, const LayoutPosition* position, string name) : IODevice(parent, name), ahrs(ahrs), output(NULL) {
-  cvmatrix_descriptor* desc=new cvmatrix_descriptor(3,2);
+  MatrixDescriptor* desc=new MatrixDescriptor(3,2);
   desc->SetElementName(0,0,"raw displacement X");
   desc->SetElementName(0,1,"raw displacement Y");

trunk/lib/FlairVisionFilter/src/OpticalFlowSpeed.cpp

@@ -29 +29 @@
 
 OpticalFlowSpeed::OpticalFlowSpeed(const IODevice* parent, const LayoutPosition* position,string name) : IODevice(parent,name) {
-  cvmatrix_descriptor* desc=new cvmatrix_descriptor(2,1);
+  MatrixDescriptor* desc=new MatrixDescriptor(2,1);
   desc->SetElementName(0,0,"vx");
   desc->SetElementName(1,0,"vy");