image: Support reading PFM images.

[apitrace] / gui / retracer.cpp

diff --git a/gui/retracer.cpp b/gui/retracer.cpp
index cb0bad35abcfb5284a79ee971a7be9f679a01c28..b42446bdd6af2ca064f3b522466dc3b778105cc2 100644 (file)
--- a/gui/retracer.cpp
+++ b/gui/retracer.cpp
@@ -395,9 +395,7 @@ void Retracer::run()
              */
 
             while (!io.atEnd()) {
-                unsigned channels = 0;
-                unsigned width = 0;
-                unsigned height = 0;
+                image::PNMInfo info;
 
                 char header[512];
                 qint64 headerSize = 0;
@@ -414,14 +412,19 @@ void Retracer::run()
                     headerSize += headerRead;
                 }
 
-                const char *headerEnd = image::readPNMHeader(header, headerSize, &channels, &width, &height);
+                const char *headerEnd = image::readPNMHeader(header, headerSize, info);
 
                 // if invalid PNM header was encountered, ...
-                if (header == headerEnd) {
+                if (headerEnd == NULL ||
+                    info.channelType != image::TYPE_UNORM8) {
                     qDebug() << "error: invalid snapshot stream encountered";
                     break;
                 }
 
+                unsigned channels = info.channels;
+                unsigned width = info.width;
+                unsigned height = info.height;
+
                 // qDebug() << "channels: " << channels << ", width: " << width << ", height: " << height";
 
                 QImage snapshot = QImage(width, height, channels == 1 ? QImage::Format_Mono : QImage::Format_RGB888);