ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-11-14 10:08:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix segfault when using more than 32 colors in colormap

Browse Source
This commit is contained in:
Matthias Hochsteger 2024-05-16 10:49:11 +02:00
parent 184a6ba4c5
commit 05c01ee884
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libsrc/visualization/mvdraw.cpp
View File

@ -497,7 +497,8 @@ namespace netgen
{ {
ntexcols = ncols; ntexcols = ncols;
GLubyte colortexture[4*32]; ArrayMem<GLubyte, 4*32> colortexture;
colortexture.SetSize(4*ncols);
const double colp[][3] = const double colp[][3] =
{ {
@ -532,8 +533,8 @@ namespace netgen
// glPixelStorei (GL_UNPACK_ALIGNMENT, 1); // glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
glTexImage1D (GL_TEXTURE_1D, 0, 4, ncols, 0, GL_RGBA, GL_UNSIGNED_BYTE, colortexture); glTexImage1D (GL_TEXTURE_1D, 0, 4, ncols, 0, GL_RGBA, GL_UNSIGNED_BYTE, colortexture.Data());
glTexImage2D (GL_TEXTURE_2D, 0, 4, ncols, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, colortexture); glTexImage2D (GL_TEXTURE_2D, 0, 4, ncols, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, colortexture.Data());
glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, typ); // DECAL or MODULATE glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, typ); // DECAL or MODULATE