cleaned up whitespace, better errors to matrix (de)serialization

Josh Klontz
1 parent 9279f0b4
Showing 2 changed files with 14 additions and 48 deletions
openbr/core/opencvutils.cpp
openbr/core/opencvutils.h
@@ -345,12 +345,12 @@ QDataStream &amp;operator&lt;&lt;(QDataStream &amp;stream, const Mat &amp;m)
     stream << rows << cols << type;
     // Write data
-    int len = rows*cols*m.elemSize();
+    int len = rows * cols * m.elemSize();
     stream << len;
     if (len > 0) {
         if (!m.isContinuous()) qFatal("Can't serialize non-continuous matrices.");
         int written = stream.writeRawData((const char*)m.data, len);
-        if (written != len) qFatal("Serialization failure.");
+        if (written != len) qFatal("Mat serialization failure, expected: %d bytes, wrote: %d bytes.", len, written);
     }
     return stream;
 }
@@ -366,9 +366,9 @@ QDataStream &amp;operator&gt;&gt;(QDataStream &amp;stream, Mat &amp;m)
     int len;
     stream >> len;
     if (len > 0) {
-        if (!m.isContinuous()) qFatal("opencvutils.cpp operator>> Mat can't deserialize non-continuous matrices.");
-        int written = stream.readRawData((char*)m.data, len);
-        if (written != len) qFatal("opencvutils.cpp operator>> Mat serialization failure.");
+        if (!m.isContinuous()) qFatal("Can't deserialize non-continuous matrices.");
+        const int read = stream.readRawData((char*)m.data, len);
+        if (read != len) qFatal("Mat deserialization failure, exptected: %d bytes, read: %d bytes.", len, read);
     }
     return stream;
 }
@@ -105,7 +105,6 @@ QDataStream &amp;operator&gt;&gt;(QDataStream &amp;stream, cv::Rect &amp;r);
 QDataStream &operator<<(QDataStream &stream, const cv::Size &s);
 QDataStream &operator>>(QDataStream &stream, cv::Size &s);
-
 // As described in "Modern C++ Design" Section 2.5.
 template <typename T>
 struct Type2Type
@@ -113,53 +112,20 @@ struct Type2Type
     typedef T OriginalType;
 };
-/****
-OpenCVType
-    Templated OpenCV Mat::type creation.
-****/
+// Templated OpenCV Mat::type creation.
 template <typename Depth, int Channels>
 class OpenCVType
 {
-    static int getDepth(Type2Type<uchar>)
-    {
-        return CV_8U;
-    }
-
-    static int getDepth(Type2Type<char>)
-    {
-        return CV_8S;
-    }
-
-    static int getDepth(Type2Type<ushort>)
-    {
-        return CV_16U;
-    }
-
-    static int getDepth(Type2Type<short>)
-    {
-        return CV_16S;
-    }
-
-    static int getDepth(Type2Type<long>)
-    {
-        return CV_32S;
-    }
-
-    static int getDepth(Type2Type<float>)
-    {
-        return CV_32F;
-    }
-
-    static int getDepth(Type2Type<double>)
-    {
-        return CV_64F;
-    }
+    static int getDepth(Type2Type<uchar>)  { return CV_8U;  }
+    static int getDepth(Type2Type<char>)   { return CV_8S;  }
+    static int getDepth(Type2Type<ushort>) { return CV_16U; }
+    static int getDepth(Type2Type<short>)  { return CV_16S; }
+    static int getDepth(Type2Type<long>)   { return CV_32S; }
+    static int getDepth(Type2Type<float>)  { return CV_32F; }
+    static int getDepth(Type2Type<double>) { return CV_64F; }
 public:
-    static int make()
-    {
-        return CV_MAKETYPE((getDepth(Type2Type<Depth>())),(Channels));
-    }
+    static int make() { return CV_MAKETYPE((getDepth(Type2Type<Depth>())),(Channels)); }
 };
 #endif // OPENCVUTILS_OPENCVUTILS_H