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

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

matrix

File:

• trunk/lib/FlairCore/src/Matrix.cpp (modified) (9 diffs)

trunk/lib/FlairCore/src/Matrix.cpp

@@ -19 +19 @@
 #include <typeinfo>
 #include <string.h>
-
-//#include <iostream>
 
 using std::string;
@@ -37 +35 @@
     this->col = col;
     if (row >= matrix->Rows() || col >= matrix->Cols()) {
-      matrix->Err("index (%i,%i) out of bound (%i,%i)\n", row, col,
+      matrix->Err("index (%i,%i) out of bound, max (%i,%i)\n", row, col,
                   matrix->Rows() - 1, matrix->Cols() - 1);
       size = 0;
@@ -71 +69 @@
       } break;
       }
+    } else if (typeid(matrix->GetDataType().GetElementDataType()) ==
+               typeid(UnsignedIntegerType)) {
+      switch (matrix->GetDataType().GetElementDataType().GetSize()) {
+      case 1: {
+        uint8_t uint8Value = matrix->Value(row, col);
+        memcpy(dst, &uint8Value, 1);
+      } break;
+      case 2: {
+        uint16_t uint16Value = matrix->Value(row, col);
+        memcpy(dst, &uint16Value, 2);
+      } break;
+      }
     }
   }
@@ -133 +143 @@
   if (row >= (uint32_t)pimpl_->descriptor->Rows() ||
       col >= (uint32_t)pimpl_->descriptor->Cols()) {
-    Warn("index (%i,%i) out of bound (%i,%i)\n", row, col,
+    Warn("index (%i,%i) out of bound, max (%i,%i)\n", row, col,
          pimpl_->descriptor->Rows() - 1, pimpl_->descriptor->Cols() - 1);
     return 0;
@@ -139 +149 @@
 
   GetMutex();
-  value = pimpl_->datas[row][col];
+  value = pimpl_->ValueNoMutex(row, col);
   ReleaseMutex();
 
@@ -148 +158 @@
   if (row >= (uint32_t)pimpl_->descriptor->Rows() ||
       col >= (uint32_t)pimpl_->descriptor->Cols()) {
-    Warn("index (%i,%i) out of bound (%i,%i)\n", row, col,
+    Warn("index (%i,%i) out of bound, max (%i,%i)\n", row, col,
          pimpl_->descriptor->Rows() - 1, pimpl_->descriptor->Cols() - 1);
     return 0;
   }
 
-  return pimpl_->datas[row][col];
+  return pimpl_->ValueNoMutex(row, col);
 }
 
@@ -159 +169 @@
   if (row >= (uint32_t)pimpl_->descriptor->Rows() ||
       col >= (uint32_t)pimpl_->descriptor->Cols()) {
-    Warn("index (%i,%i) out of bound (%i,%i)\n", row, col,
+    Warn("index (%i,%i) out of bound, max (%i,%i)\n", row, col,
          pimpl_->descriptor->Rows() - 1, pimpl_->descriptor->Cols() - 1);
   } else {
     GetMutex();
-    pimpl_->datas[row][col]=value;
+    pimpl_->SetValueNoMutex(row, col,value);
     ReleaseMutex();
   }
@@ -171 +181 @@
   if (row >= (uint32_t)pimpl_->descriptor->Rows() ||
       col >= (uint32_t)pimpl_->descriptor->Cols()) {
-    Warn("index (%i,%i) out of bound (%i,%i)\n", row, col,
+    Warn("index (%i,%i) out of bound, max (%i,%i)\n", row, col,
          pimpl_->descriptor->Rows() - 1, pimpl_->descriptor->Cols() - 1);
   } else {
-    pimpl_->datas[row][col]=value;
+    pimpl_->SetValueNoMutex(row, col,value);
   }
 }
@@ -180 +190 @@
 void Matrix::CopyDatas(char *dst) const {
   GetMutex();
-  // printf("%f %x %i\n",cvGetReal2D(pimpl_->mat,0,0),dst,Size());
   memcpy(dst, pimpl_->datas, dataType.GetSize());
   ReleaseMutex();