summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-02-09 15:00:57 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-02-09 15:12:18 +0000
commit904d5010be5e22cdda49cbc09d332d3ee0c00b84 (patch)
tree051626041d1c642536024de82715b967e7487c62 /chart2
parent042fec5bf2d00e55a0ef8b2a0120e821189b5088 (diff)
coverity#1169877 Uninitialized pointer field
Change-Id: I3a64f7d476b682c68d05a25ed4b2287ef3e482d5
Diffstat (limited to 'chart2')
-rwxr-xr-xchart2/source/view/main/OpenGLRender.cxx48
-rwxr-xr-xchart2/source/view/main/OpenGLRender.hxx14
2 files changed, 48 insertions, 14 deletions
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index cc031f3004c6..1f07b4659563 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -756,22 +756,42 @@ void OpenGLRender::Release()
#endif
}
-OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape > xTarget):
- m_Model(glm::mat4(1.0f)),
- m_TextureObj(0),
- m_FboID(0),
- m_RboID(0),
- m_iWidth(0),
- m_iHeight(0),
- mxRenderTarget(xTarget),
- mbArbMultisampleSupported(false),
+OpenGLRender::OpenGLRender(uno::Reference< drawing::XShape > xTarget)
+ : m_Model(glm::mat4(1.0f))
+ , m_TextureObj(0)
+ , m_FboID(0)
+ , m_RboID(0)
+ , m_iWidth(0)
+ , m_iHeight(0)
+ , m_fLineWidth(0)
+ , mxRenderTarget(xTarget)
+ , mbArbMultisampleSupported(false)
#if defined( _WIN32 )
- m_iArbMultisampleFormat(0),
+ , m_iArbMultisampleFormat(0)
#endif
- m_2DColor(glm::vec4(1.0, 0.0, 0.0, 1.0)),
- m_frameBufferMS(0),
- m_TextVertexID(0),
- m_TextTexCoordID(1)
+ , m_2DColor(glm::vec4(1.0, 0.0, 0.0, 1.0))
+ , m_frameBufferMS(0)
+ , m_renderBufferColorMS(0)
+ , m_renderBufferDepthMS(0)
+ , m_CommonProID(0)
+ , m_2DVertexID(0)
+ , m_2DColorID(0)
+ , m_fZStep(0)
+ , m_TextProID(0)
+ , m_TextMatrixID(0)
+ , m_TextVertexID(0)
+ , m_TextTexCoordID(1)
+ , m_TextTexCoordBuf(0)
+ , m_TextTexID(0)
+ , m_BackgroundProID(0)
+ , m_BackgroundMatrixID(0)
+ , m_BackgroundVertexID(0)
+ , m_BackgroundColorID(0)
+ , m_SymbolProID(0)
+ , m_SymbolVertexID(0)
+ , m_SymbolMatrixID(0)
+ , m_SymbolColorID(0)
+ , m_SymbolShapeID(0)
{
//TODO: moggi: use STL
memset(&m_Bubble2DCircle, 0, sizeof(m_Bubble2DCircle));
diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx
index 8ba5c761a21d..32c91c597d0a 100755
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -123,6 +123,20 @@ struct GLWindow
const GLubyte* GLExtensions;
bool HasGLExtension( const char* name ) { return gluCheckExtension( (const GLubyte*) name, GLExtensions ); }
+
+ GLWindow()
+ :
+#if defined( _WIN32 )
+#elif defined( MACOSX )
+#elif defined( UNX )
+ GLXExtensions(NULL),
+#endif
+ bpp(0),
+ Width(0),
+ Height(0),
+ GLExtensions(NULL)
+ {
+ }
};
class OpenGLRender