Skip to content

Commit 79ebdae

Browse files
committed
CScreensaverFlux: use std::vector for m_fluxes
Signed-off-by: Lukas Rusak <lorusak@gmail.com>
1 parent 151d37b commit 79ebdae

2 files changed

Lines changed: 2 additions & 5 deletions

File tree

src/flux/main.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ bool CScreensaverFlux::Start()
602602
m_lumdiff = 1.0f / float(gSettings.dTrail);
603603

604604
// Initialize flux fields
605-
m_fluxes = new CFlux[gSettings.dFluxes];
605+
m_fluxes.resize(gSettings.dFluxes);
606606

607607
glGenBuffers(1, &m_vertexVBO);
608608
glBindBuffer(GL_ARRAY_BUFFER, m_vertexVBO);
@@ -638,9 +638,6 @@ void CScreensaverFlux::Stop()
638638
#if defined(HAS_GL) || (defined(HAS_GLES) && HAS_GLES == 3)
639639
glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
640640
#endif
641-
642-
// Free memory
643-
delete[] m_fluxes;
644641
}
645642

646643
void CScreensaverFlux::Render()

src/flux/main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class ATTR_DLL_LOCAL CScreensaverFlux
107107

108108
GLuint m_lightingEnabled = 0;
109109

110-
CFlux *m_fluxes;
110+
std::vector<CFlux> m_fluxes;
111111

112112
std::vector<sLight> m_sphereTriangleFan1;
113113
std::vector<sLight> m_sphereTriangleFan2;

0 commit comments

Comments
 (0)