Merge lp:~hacker-emmanuel/stellarium/bug_1172931 into lp:stellarium

Proposed by Emmanuel on 2013-04-28
Status: Merged
Merged at revision: 6002
Proposed branch: lp:~hacker-emmanuel/stellarium/bug_1172931
Merge into: lp:stellarium
Diff against target: 34 lines (+3/-3)
2 files modified
CMakeLists.txt (+2/-2)
src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp (+1/-1)
To merge this branch: bzr merge lp:~hacker-emmanuel/stellarium/bug_1172931
Reviewer Review Type Date Requested Status
Stellarium 2013-04-28 Pending
Review via email: mp+161333@code.launchpad.net

Description of the change

fix malloc/delete mismatch

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-04-23 13:00:55 +0000
3+++ CMakeLists.txt 2013-04-28 18:32:26 +0000
4@@ -24,7 +24,7 @@
5
6 ########### Main global variables ###########
7 IF(NOT CMAKE_BUILD_TYPE)
8- SET(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build, options are: None Debug GProf Valgrind Release RelWithDebInfo MinSizeRel." FORCE)
9+ SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug GProf Valgrind Release RelWithDebInfo MinSizeRel." FORCE)
10 ENDIF()
11
12 # Add gprof build options if necessary. Note gmon.out will be created in working directory when Stellarium is executed
13@@ -41,7 +41,7 @@
14 ENDIF()
15
16 IF(NOT STELLARIUM_SPLASH)
17- SET(STELLARIUM_SPLASH Development CACHE STRING "Choose the type of Stellarium's splash image, options are: Release Development ReleaseCandidate." FORCE)
18+ SET(STELLARIUM_SPLASH Release CACHE STRING "Choose the type of Stellarium's splash image, options are: Release Development ReleaseCandidate." FORCE)
19 ENDIF()
20 ADD_DEFINITIONS(-DSTELLARIUM_SPLASH="${STELLARIUM_SPLASH}")
21
22
23=== modified file 'src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp'
24--- src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp 2012-09-03 23:57:19 +0000
25+++ src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp 2013-04-28 18:32:26 +0000
26@@ -47,7 +47,7 @@
27
28 StelQGLInterleavedArrayVertexBufferBackend::~StelQGLInterleavedArrayVertexBufferBackend()
29 {
30- delete vertices;
31+ std::free(vertices);
32 if(NULL != projectedPositions)
33 {
34 std::free(projectedPositions);