Changeset 148 in flair-src for trunk/lib/FlairCore

Timestamp:

Feb 28, 2017, 4:18:13 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

m

Location:

trunk/lib/FlairCore/src

Files:

• cvmatrix.h (modified) (1 diff)
• cvmatrix_impl.cpp (modified) (1 diff)
• unexported/cvmatrix_impl.h (modified) (1 diff)

trunk/lib/FlairCore/src/cvmatrix.h

@@ -59 +59 @@
   *
   * \param parent parent
-  * \param descriptor matrix description
+  * \param descriptor matrix description, it is safe to destroy it after calling this constructor
   * \param type type of matrix elements
   * \param name name

trunk/lib/FlairCore/src/cvmatrix_impl.cpp

@@ -33 +33 @@
 
 cvmatrix_impl::cvmatrix_impl(cvmatrix *self,
-                             const cvmatrix_descriptor *descriptor,
+                             const cvmatrix_descriptor *inDescriptor,
                              flair::core::ScalarType const &_elementDataType,
                              int n)
     : elementDataType(_elementDataType) {
-  this->descriptor = descriptor;
+  descriptor = new cvmatrix_descriptor(inDescriptor->Rows(), inDescriptor->Cols());
+
+  for (uint32_t i = 0; i < descriptor->Rows(); i++) {
+    for (uint32_t j = 0; j < descriptor->Cols(); j++) {
+      descriptor->SetElementName(i, j, inDescriptor->ElementName(i, j));
+    }
+  }
   Init(self, n);
 }

trunk/lib/FlairCore/src/unexported/cvmatrix_impl.h

@@ -34 +34 @@
   CvMat *mat;
   flair::core::ScalarType const &elementDataType;
-  // const since if element description is modified it would be a mess in the
-  // log
-  const flair::core::cvmatrix_descriptor *descriptor;
+  flair::core::cvmatrix_descriptor *descriptor;
 
 private: