Changeset 214 in flair-src for trunk/lib/FlairFilter/src/NestedSat_impl.cpp

Timestamp:

Feb 7, 2018, 5:49:27 PM (7 years ago)

Author:

Sanahuja Guillaume

Message:

matrix

File:

• trunk/lib/FlairFilter/src/NestedSat_impl.cpp (modified) (3 diffs)

trunk/lib/FlairFilter/src/NestedSat_impl.cpp

@@ -18 +18 @@
 #include "NestedSat_impl.h"
 #include "NestedSat.h"
-#include <cvmatrix.h>
+#include <Matrix.h>
 #include <Layout.h>
 #include <GroupBox.h>
@@ -34 +34 @@
 
   // init matrix
-  self->input = new cvmatrix(self, 3, 1, floatType, name);
+  self->input = new Matrix(self, 3, 1, floatType, name);
 
   GroupBox *reglages_groupbox = new GroupBox(position, name);
@@ -50 +50 @@
 void NestedSat_impl::UpdateFrom(const io_data *data) {
   float cons, dcons, law;
-  cvmatrix *input = (cvmatrix *)data;
+  const Matrix* input = dynamic_cast<const Matrix*>(data);
+  
+  if (!input) {
+      self->Warn("casting %s to Matrix failed\n",data->ObjectName().c_str());
+      return;
+  }
 
   input->GetMutex();