VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-07-20 01:35:20 -04:00
Code Issues Projects Releases Wiki Activity

GLShaderTVArray: fixed regression introduced by commit a08e18b

Browse Source
This commit is contained in:
f4exb 2020-12-20 08:51:42 +01:00
parent 8c307eb0e6
commit 437675b7e0
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sdrgui/gui/glshadertvarray.cpp
View File

@ -17,7 +17,8 @@
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#include <QOpenGLContext> #include <QOpenGLContext>
#include <gui/glshadertvarray.h>
#include "gui/glshadertvarray.h"
const QString GLShaderTVArray::m_strVertexShaderSourceArray = QString( const QString GLShaderTVArray::m_strVertexShaderSourceArray = QString(
"uniform highp mat4 uMatrix;\n" "uniform highp mat4 uMatrix;\n"
@ -129,19 +130,16 @@ void GLShaderTVArray::initializeGL(int intCols, int intRows)
QRgb * GLShaderTVArray::GetRowBuffer(int intRow) QRgb * GLShaderTVArray::GetRowBuffer(int intRow)
{ {
if (!m_blnInitialized) if (!m_blnInitialized) {
{ return nullptr;
return 0;
} }
if (!m_objImage) if (!m_objImage) {
{ return nullptr;
return 0;
} }
if (intRow > m_intRows) if (intRow > m_intRows) {
{ return nullptr;
return 0;
} }
return (QRgb *) m_objImage->scanLine(intRow); return (QRgb *) m_objImage->scanLine(intRow);
@ -175,7 +173,7 @@ void GLShaderTVArray::RenderPixels(unsigned char *chrData)
return; return;
} }
if (m_objImage) { if (!m_objImage) {
return; return;
} }
@ -319,7 +317,7 @@ bool GLShaderTVArray::SetDataColor(int intCol, QRgb objColor)
if (m_blnInitialized) if (m_blnInitialized)
{ {
if ((intCol < m_intCols) && (intCol >= 0) && (m_objCurrentRow)) if ((intCol < m_intCols) && (intCol >= 0) && m_objCurrentRow)
{ {
m_objCurrentRow[intCol] = objColor; m_objCurrentRow[intCol] = objColor;
blnRslt = true; blnRslt = true;