X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=gui%2Fapisurface.cpp;h=d17560f4ca7e62c0eba638099bc302399eabf6d7;hb=c8695f74ce1ee6a93dee4b3f7da5a70a64706c82;hp=8c985ae282a0b2321484705c8c054bdfa40ef5f6;hpb=a68464141d0ad5a833d5661a52b06950db6c61a5;p=apitrace

diff --git a/gui/apisurface.cpp b/gui/apisurface.cpp
index 8c985ae..d17560f 100644
--- a/gui/apisurface.cpp
+++ b/gui/apisurface.cpp
@@ -1,4 +1,5 @@
 #include "apisurface.h"
+#include "thumbnail.h"
 
 #include <QDebug>
 #include <QSysInfo>
@@ -17,55 +18,11 @@ void ApiSurface::setSize(const QSize &size)
     m_size = size;
 }
 
-static inline int
-rgba8_to_argb(quint8 r, quint8 g, quint8 b, quint8 a)
-{
-    return (a << 24 | r << 16 | g << 8 | b);
-}
-
-static inline int
-rgbaf2argb(float r, float g, float b, float a)
-{
-    quint8 rb = r * 255;
-    quint8 gb = g * 255;
-    quint8 bb = b * 255;
-    quint8 ab = a * 255;
-
-    return (ab << 24 | rb << 16 | gb << 8 | bb);
-}
-
 void ApiSurface::contentsFromBase64(const QByteArray &base64)
 {
     QByteArray dataArray = QByteArray::fromBase64(base64);
-    const quint8 *data = (const quint8*)dataArray.data();
-    int width = m_size.width();
-    int height = m_size.height();
-
-    if (width <= 0 || height <= 0)
-        return;
-
-    int *pixelData = (int*)malloc(sizeof(int) * width * height);
-
-    //XXX not sure if this will work when
-    //    QSysInfo::ByteOrder == QSysInfo::BigEndian
-
-    for (int y = 0; y < height; ++y) {
-        for (int x = 0; x < width; ++x) {
-            int pixel = rgba8_to_argb(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;
-        }
-    }
-
-    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");
-
-    free(pixelData);
+    m_image.loadFromData(dataArray, "png");
+    m_thumb = thumbnail(m_image);
 }
 
 QImage ApiSurface::image() const
@@ -78,41 +35,40 @@ 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()
 {
-    m_target = str;
 }
 
-int ApiTexture::level() const
+QString ApiTexture::label() const
 {
-    return m_level;
+    return m_label;
 }
 
-void ApiTexture::setLevel(int l)
+void ApiTexture::setLabel(const QString &str)
 {
-    m_level = l;
+    m_label = str;
 }
 
 ApiFramebuffer::ApiFramebuffer()
@@ -129,3 +85,4 @@ void ApiFramebuffer::setType(const QString &str)
 {
     m_type = str;
 }
+