diff --git a/sdrgui/gui/glshadertvarray.cpp b/sdrgui/gui/glshadertvarray.cpp index 5a8f4602c..0ed685258 100644 --- a/sdrgui/gui/glshadertvarray.cpp +++ b/sdrgui/gui/glshadertvarray.cpp @@ -37,24 +37,25 @@ const QString GLShaderTVArray::m_strFragmentShaderSourceColored = QString( " gl_FragColor = texture2D(uTexture, texCoordVar);\n" "}\n"); -GLShaderTVArray::GLShaderTVArray(bool blnColor) : m_blnColor(blnColor) +GLShaderTVArray::GLShaderTVArray(bool blnColor) : + m_objProgram(nullptr), + m_matrixLoc(0), + m_textureLoc(0), + m_objImage(nullptr), + m_objTexture(nullptr), + m_intCols(0), + m_intRows(0), + m_objCurrentRow(nullptr), + m_blnInitialized(false), + m_blnColor(blnColor), + m_blnAlphaBlend(false), + m_blnAlphaReset(false) { - m_blnAlphaBlend = false; - m_blnAlphaReset = false; - m_objProgram = nullptr; - m_objImage = nullptr; - m_objTexture = nullptr; - m_intCols = 0; - m_intRows = 0; - m_blnInitialized = false; - m_objCurrentRow = nullptr; - - m_textureLoc = 0; - m_matrixLoc = 0; } GLShaderTVArray::~GLShaderTVArray() { + qDebug("GLShaderTVArray::~GLShaderTVArray"); cleanup(); } @@ -128,7 +129,7 @@ void GLShaderTVArray::initializeGL(int intCols, int intRows) } -QRgb * GLShaderTVArray::GetRowBuffer(int intRow) +QRgb *GLShaderTVArray::GetRowBuffer(int intRow) { if (!m_blnInitialized) { return nullptr; diff --git a/sdrgui/gui/glshadertvarray.h b/sdrgui/gui/glshadertvarray.h index 488acba3c..4a2ce35f5 100644 --- a/sdrgui/gui/glshadertvarray.h +++ b/sdrgui/gui/glshadertvarray.h @@ -55,9 +55,7 @@ public: bool SelectRow(int intLine); bool SetDataColor(int intCol,QRgb objColor); - protected: - QOpenGLShaderProgram *m_objProgram; int m_matrixLoc; int m_textureLoc; @@ -65,13 +63,13 @@ protected: static const QString m_strVertexShaderSourceArray; static const QString m_strFragmentShaderSourceColored; - QImage *m_objImage=NULL; - QOpenGLTexture *m_objTexture=NULL; + QImage *m_objImage; + QOpenGLTexture *m_objTexture; int m_intCols; int m_intRows; - QRgb * m_objCurrentRow; + QRgb *m_objCurrentRow; bool m_blnInitialized; bool m_blnColor;