Changeset 214 in flair-src for trunk/lib/FlairCore/src/Matrix_impl.cpp

Timestamp:

02/07/18 17:49:27 (6 years ago)

Author:

Sanahuja Guillaume

Message:

matrix

File:

• trunk/lib/FlairCore/src/Matrix_impl.cpp (modified) (2 diffs)

trunk/lib/FlairCore/src/Matrix_impl.cpp

@@ -54 +54 @@
         dynamic_cast<ScalarType const &>(elementDataType);
     if (typeid(scalarType) == typeid(FloatType)) {
-      datas = (float **)malloc(descriptor->Rows() * sizeof(float*));
-      if(datas==NULL) {
-        self->Err("error allocating matrix\n");
-        return;
-      }
-      for(uint32_t i=0 ; i < descriptor->Rows() ; i++){
-        datas[i] = (float*)malloc(descriptor->Cols() * sizeof(float) ); 
-        if(datas[i]==NULL) {
-          self->Err("error allocating matrix\n");
-          for(uint32_t j = i-1 ; j >= 0 ; j--) free(datas[j]);
-          free(datas);
-          return;
-        }
-      }
-      /*
-    } else if (typeid(scalarType) == typeid(SignedIntegerType)) {
+      datas =malloc(descriptor->Rows() * descriptor->Cols() * sizeof(float));
+    } else if (typeid(scalarType) == typeid(SignedIntegerType) || typeid(scalarType) == typeid(UnsignedIntegerType) ) {
       switch (elementDataType.GetSize()) {
       case 1:
-        mat = cvCreateMat(descriptor->Rows(), descriptor->Cols(), CV_8SC1);
+        datas=malloc(descriptor->Rows() * descriptor->Cols() * sizeof(uint8_t));
         break;
       case 2:
-        mat = cvCreateMat(descriptor->Rows(), descriptor->Cols(), CV_16SC1);
+        datas=malloc(descriptor->Rows() * descriptor->Cols() * sizeof(uint16_t));
         break;
       default:
         self->Err("unsupported integer scalar type\n");
-      }*/
+      }
     } else {
       self->Err("unsupported scalar type\n");
@@ -94 +80 @@
 
 Matrix_impl::~Matrix_impl() {
-  for (uint32_t i = 0; i < descriptor->Rows();i++) {
-    free(datas[i]);
-  }
   free(datas);
   delete descriptor;
 }
+
+float Matrix_impl::ValueNoMutex(uint32_t row, uint32_t col) const {
+  ScalarType const &scalarType =
+        dynamic_cast<ScalarType const &>(elementDataType);
+  if (typeid(scalarType) == typeid(FloatType)) {
+    return ((float*)datas)[row*descriptor->Cols()+col];
+  } else if (typeid(scalarType) == typeid(SignedIntegerType)) {
+    switch (elementDataType.GetSize()) {
+    case 1:
+      return ((int8_t*)datas)[row*descriptor->Cols()+col];
+      break;
+    case 2:
+      return ((int16_t*)datas)[row*descriptor->Cols()+col];
+      break;
+    default:
+      self->Err("unsupported signed integer scalar type\n");
+    }
+  } else if (typeid(scalarType) == typeid(UnsignedIntegerType)) {
+    switch (elementDataType.GetSize()) {
+    case 1:
+      return ((uint8_t*)datas)[row*descriptor->Cols()+col];
+      break;
+    case 2:
+      return ((uint16_t*)datas)[row*descriptor->Cols()+col];
+      break;
+    default:
+      self->Err("unsupported unsigned integer scalar type\n");
+    }
+  } else {
+    self->Err("unsupported scalar type\n");
+  }
+  return 0;
+}
+
+void Matrix_impl::SetValueNoMutex(uint32_t row, uint32_t col, float value) {
+ ScalarType const &scalarType =
+        dynamic_cast<ScalarType const &>(elementDataType);
+  if (typeid(scalarType) == typeid(FloatType)) {
+    ((float*)datas)[row*descriptor->Cols()+col]=value;
+  } else if (typeid(scalarType) == typeid(SignedIntegerType)) {
+    switch (elementDataType.GetSize()) {
+    case 1:
+      ((int8_t*)datas)[row*descriptor->Cols()+col]=value;
+      break;
+    case 2:
+      ((int16_t*)datas)[row*descriptor->Cols()+col]=value;
+      break;
+    default:
+      self->Err("unsupported signed integer scalar type\n");
+    }
+  } else if (typeid(scalarType) == typeid(UnsignedIntegerType)) {
+    switch (elementDataType.GetSize()) {
+    case 1:
+      ((uint8_t*)datas)[row*descriptor->Cols()+col]=value;
+      break;
+    case 2:
+      ((uint16_t*)datas)[row*descriptor->Cols()+col]=value;
+      break;
+    default:
+      self->Err("unsupported unsigned integer scalar type\n");
+    }
+  } else {
+    self->Err("unsupported scalar type\n");
+  }
+}