Generalized the raw format

Scott Klum
1 parent bbc43870
Showing 1 changed file with 9 additions and 35 deletions
openbr/plugins/format/raw.cpp
@@ -26,49 +26,25 @@ namespace br
  * \ingroup formats
  * \brief RAW format
  *
- * \br_link http://www.nist.gov/srd/nistsd27.cfm
- * \author Josh Klontz \cite jklontz
+ * \author Scott Klum \cite sklum
  */
 class rawFormat : public Format
 {
     Q_OBJECT
-    static QHash<QString, QHash<QString,QSize> > imageSizes; // QHash<Path, QHash<File,Size> >
     Template read() const
     {
-        QString path = file.path();
-        if (!imageSizes.contains(path)) {
-            static QMutex mutex;
-            QMutexLocker locker(&mutex);
-
-            if (!imageSizes.contains(path)) {
-                const QString imageSize = path+"/ImageSize.txt";
-                QStringList lines;
-                if (QFileInfo(imageSize).exists()) {
-                    lines = QtUtils::readLines(imageSize);
-                    lines.removeFirst(); // Remove header
-                }
-
-                QHash<QString,QSize> sizes;
-                QRegExp whiteSpace("\\s+");
-                foreach (const QString &line, lines) {
-                    QStringList words = line.split(whiteSpace);
-                    if (words.size() != 3) continue;
-                    sizes.insert(words[0], QSize(words[2].toInt(), words[1].toInt()));
-                }
-
-                imageSizes.insert(path, sizes);
-            }
-        }
-
         QByteArray data;
         QtUtils::readFile(file, data);
-        QSize size = imageSizes[path][file.baseName()];
-        if (!size.isValid()) size = QSize(800,768);
-        if (data.size() != size.width() * size.height())
-            qFatal("Expected %d*%d bytes, got %d.", size.height(), size.width(), data.size());
-        return Template(file, Mat(size.height(), size.width(), CV_8UC1, data.data()).clone());
+        // The raw file format has no header information, so one must specify resolution
+        QSize size = size = QSize(file.get<int>("width"),file.get<int>("height"));
+        Template t(file);
+        QList<Mat> matrices;
+        const int bytes = size.width()*size.height();
+        for (int i=0; i<data.size()/(size.height()*size.width()); i++)
+            t.append(Mat(size.height(), size.width(), CV_8UC1, data.data()+bytes*i).clone());
+        return t;
     }
     void write(const Template &t) const
@@ -77,8 +53,6 @@ class rawFormat : public Format
     }
 };
-QHash<QString, QHash<QString,QSize> > rawFormat::imageSizes;
-
 BR_REGISTER(Format, rawFormat)
 } // namespace br