OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0030248: Volume Rendering - importing volume with default parameters leads to crashes within OpenGl_Texture::Init3D()

Browse Source
This commit is contained in:
kgv 2018-10-17 14:01:30 +03:00 committed by apn
parent 5f41ce6626
commit 90fd614536
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/OpenGl/OpenGl_Texture.cxx
View File

@ -30,7 +30,7 @@ struct OpenGl_UnpackAlignmentSentry
{
//! Reset unpack alignment settings to safe values
void Reset()
static void Reset()
{
glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
#if !defined(GL_ES_VERSION_2_0)
@ -38,6 +38,8 @@ struct OpenGl_UnpackAlignmentSentry
#endif
}
OpenGl_UnpackAlignmentSentry() {}
~OpenGl_UnpackAlignmentSentry()
{
Reset();
@ -840,6 +842,9 @@ bool OpenGl_Texture::InitRectangle (const Handle(OpenGl_Context)& theCtx,
myTextFormat = theFormat.Format();
mySizedFormat = theFormat.Internal();
// setup the alignment
OpenGl_UnpackAlignmentSentry::Reset();
glTexImage2D (GL_PROXY_TEXTURE_RECTANGLE, 0, mySizedFormat,
aSizeX, aSizeY, 0,
myTextFormat, GL_FLOAT, NULL);
@ -938,6 +943,9 @@ bool OpenGl_Texture::Init3D (const Handle(OpenGl_Context)& theCtx,
mySizedFormat = theTextFormat;
// setup the alignment
OpenGl_UnpackAlignmentSentry::Reset();
#if !defined (GL_ES_VERSION_2_0)
theCtx->core15fwd->glTexImage3D (GL_PROXY_TEXTURE_3D, 0, mySizedFormat,
aSizeX, aSizeY, aSizeZ, 0,