X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=gui%2Fapisurface.cpp;h=3732ed5f717482ad976fbf6f9f0d9e447113b91c;hb=994535d1b11e13c11b923933ad39021d5040a466;hp=105532e9a2c07cc9dfc5b07fca644a828382a211;hpb=952e9d4fe14932da90c8478ed8883bb043d702ff;p=apitrace

diff --git a/gui/apisurface.cpp b/gui/apisurface.cpp
index 105532e..3732ed5 100644
--- a/gui/apisurface.cpp
+++ b/gui/apisurface.cpp
@@ -1,8 +1,14 @@
 #include "apisurface.h"
+#include "thumbnail.h"
+
+#include <sstream>
 
 #include <QDebug>
 #include <QSysInfo>
 
+#include "image/image.hpp"
+
+
 ApiSurface::ApiSurface()
 {
 }
@@ -17,49 +23,95 @@ void ApiSurface::setSize(const QSize &size)
     m_size = size;
 }
 
-static inline int
-rgbaf2argb(float r, float g, float b, float a)
+struct ByteArrayBuf : public std::streambuf
 {
-    quint8 rb = r * 255;
-    quint8 gb = g * 255;
-    quint8 bb = b * 255;
-    quint8 ab = a * 255;
-
-    return (ab << 24 | rb << 16 | gb << 8 | bb);
-}
+    ByteArrayBuf(QByteArray & a)
+    {
+        setg(a.data(), a.data(), a.data() + a.size());
+    }
+};
 
 void ApiSurface::contentsFromBase64(const QByteArray &base64)
 {
     QByteArray dataArray = QByteArray::fromBase64(base64);
-    const float *data = (const float*)dataArray.data();
-    int width = m_size.width();
-    int height = m_size.height();
 
-    if (width <= 0 || height <= 0)
-        return;
+    image::Image *image;
+
+    /*
+     * Detect the PNG vs PFM images.
+     */
+    const char pngSignature[] = {(char)0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0};
+    if (dataArray.startsWith(pngSignature)) {
+        ByteArrayBuf buf(dataArray);
+        std::istream istr(&buf);
+        image = image::readPNG(istr);
+    } else {
+        image = image::readPNM(dataArray.data(), dataArray.size());
+    }
+
+    /*
+     * FIXME: Instead of converting to QImage here, we should be deferring the conversion
+     * to imageviewer.cpp.
+     *
+     * XXX: We still need the thumbnail though.
+     */
+
+    Q_ASSERT(image);
 
-    int *pixelData = (int*)malloc(sizeof(int) * width * height);
+    int width = image->width;
+    int height = image->height;
 
-    //XXX not sure if this will work when
-    //    QSysInfo::ByteOrder == QSysInfo::BigEndian
+    m_image = QImage(width, height, QImage::Format_ARGB32);
 
+    const unsigned char *srcRow = image->start();
     for (int y = 0; y < height; ++y) {
-        for (int x = 0; x < width; ++x) {
-            int pixel = rgbaf2argb(data[(y * width + x) * 4 + 0],
-                                   data[(y * width + x) * 4 + 1],
-                                   data[(y * width + x) * 4 + 2],
-                                   data[(y * width + x) * 4 + 3]);
-            pixelData[y * width + x] = pixel;
+        QRgb *dst = (QRgb *)m_image.scanLine(y);
+
+        if (image->channelType == image::TYPE_UNORM8) {
+            const unsigned char *src = srcRow;
+            for (int x = 0; x < width; ++x) {
+                unsigned char rgba[4];
+                for (int c = 0; c < image->channels; ++c) {
+                    rgba[c] = *src++;
+                }
+                if (image->channels == 1) {
+                    // Use gray-scale instead of red
+                    rgba[1] = rgba[0];
+                    rgba[2] = rgba[0];
+                }
+                dst[x] = qRgba(rgba[0], rgba[1], rgba[2], rgba[3]);
+            }
+        } else {
+            const float *src = (const float *)srcRow;
+            for (int x = 0; x < width; ++x) {
+                unsigned char rgba[4] = {0, 0, 0, 0xff};
+                for (int c = 0; c < image->channels; ++c) {
+                    float f = *src++;
+                    unsigned char u;
+                    if (f >= 1.0f) {
+                        u = 255;
+                    } else if (f <= 0.0f) {
+                        u = 0;
+                    } else {
+                        u = f * 255 + 0.5;
+                    }
+                    rgba[c] = u;
+                }
+                if (image->channels == 1) {
+                    // Use gray-scale instead of red
+                    rgba[1] = rgba[0];
+                    rgba[2] = rgba[0];
+                }
+                dst[x] = qRgba(rgba[0], rgba[1], rgba[2], rgba[3]);
+            }
         }
+
+        srcRow += image->stride();
     }
 
-    m_image = QImage((uchar*)pixelData,
-                     width, height,
-                     QImage::Format_ARGB32).mirrored();
-    m_thumb = m_image.scaled(64, 64, Qt::KeepAspectRatio);
-    //m_image.save("testoutput.png");
+    delete image;
 
-    free(pixelData);
+    m_thumb = thumbnail(m_image);
 }
 
 QImage ApiSurface::image() const
@@ -72,39 +124,54 @@ QImage ApiSurface::thumb() const
     return m_thumb;
 }
 
-ApiTexture::ApiTexture()
-    : ApiSurface(),
-      m_unit(0),
-      m_level(0)
+int ApiSurface::depth() const
 {
+    return m_depth;
 }
 
-int ApiTexture::unit() const
+void ApiSurface::setDepth(int depth)
 {
-    return m_unit;
+    m_depth = depth;
 }
 
-void ApiTexture::setUnit(int un)
+QString ApiSurface::formatName() const
 {
-    m_unit = un;
+    return m_formatName;
 }
 
-QString ApiTexture::target() const
+void ApiSurface::setFormatName(const QString &str)
 {
-    return m_target;
+    m_formatName = str;
 }
 
-void ApiTexture::setTarget(const QString &str)
+
+ApiTexture::ApiTexture()
+    : ApiSurface()
+{
+}
+
+QString ApiTexture::label() const
 {
-    m_target = str;
+    return m_label;
 }
 
-int ApiTexture::level() const
+void ApiTexture::setLabel(const QString &str)
 {
-    return m_level;
+    m_label = str;
 }
 
-void ApiTexture::setLevel(int l)
+ApiFramebuffer::ApiFramebuffer()
+    : ApiSurface()
 {
-    m_level = l;
 }
+
+QString ApiFramebuffer::type() const
+{
+    return m_type;
+}
+
+void ApiFramebuffer::setType(const QString &str)
+{
+    m_type = str;
+}
+