Hardcode base64 enconding.

Array is too verbose to keep as a valid alternative.

diff --git a/glstate.py b/glstate.py
index 82f8b9f05ea289b1479fa466cb17cc47ae13b974..74cdc64d580889c465e46ff6a16eea87f5c828b6 100644 (file)
--- a/glstate.py
+++ b/glstate.py
@@ -3062,30 +3062,10 @@ writeTextureImage(JSONWriter &json, GLenum target, GLint level)
         
         glGetTexImage(target, level, GL_RGBA, GL_FLOAT, pixels);
 
-        if (0) {
-            json.writeStringMember("__encoding__", "array");
-            json.beginMember("__data__");
-
-            json.beginArray();
-            for (GLint y = 0; y < height; ++y) {
-                json.beginArray();
-                for (GLint x = 0; x < width; ++x) {
-                    json.beginArray();
-                    for (GLint chan = 0; chan < 4; ++chan) {
-                        json.writeNumber(pixels[(y*width + x)*4 + chan]); 
-                    }
-                    json.endArray();
-                }
-                json.endArray();
-            }
-            json.endArray();
-            json.endMember(); // __data__
-        } else {
-            json.writeStringMember("__encoding__", "base64");
-            json.beginMember("__data__");
-            json.writeBase64(pixels, width * height * 4 * sizeof *pixels);
-            json.endMember(); // __data__
-        }
+        json.writeStringMember("__encoding__", "base64");
+        json.beginMember("__data__");
+        json.writeBase64(pixels, width * height * 4 * sizeof *pixels);
+        json.endMember(); // __data__
 
         delete [] pixels;
         json.endObject();

diff --git a/gui/apitracecall.cpp b/gui/apitracecall.cpp
index 70cc3f79cc64cb95855c83137ecd31257c238f7b..351b2a98ddd7232e9da0a42b9be8ceff9d837faa 100644 (file)
--- a/gui/apitracecall.cpp
+++ b/gui/apitracecall.cpp
@@ -459,11 +459,8 @@ ApiTraceState::ApiTraceState(const QVariantMap &parsedJson)
                     QString type = image[QLatin1String("__type__")].toString();
                     int numChannels =
                         image[QLatin1String("__channels__")].toInt();
-                    QString encoding =
-                        image[QLatin1String("__encoding__")].toString();
 
                     Q_ASSERT(numChannels == 4);
-                    Q_ASSERT(encoding == QLatin1String("base64"));
                     Q_ASSERT(type == QLatin1String("float"));
 
                     QByteArray dataArray =