Stellarium

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

  1. bug_1172931
  2. Merge into trunk
Proposed by Emmanuel
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 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
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-04-23 13:00:55 +0000
+++ CMakeLists.txt 2013-04-28 18:32:26 +0000
@@ -24,7 +24,7 @@
2424
25########### Main global variables ###########25########### Main global variables ###########
26IF(NOT CMAKE_BUILD_TYPE)26IF(NOT CMAKE_BUILD_TYPE)
27 SET(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build, options are: None Debug GProf Valgrind Release RelWithDebInfo MinSizeRel." FORCE)27 SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug GProf Valgrind Release RelWithDebInfo MinSizeRel." FORCE)
28ENDIF()28ENDIF()
2929
30# Add gprof build options if necessary. Note gmon.out will be created in working directory when Stellarium is executed30# Add gprof build options if necessary. Note gmon.out will be created in working directory when Stellarium is executed
@@ -41,7 +41,7 @@
41ENDIF()41ENDIF()
4242
43IF(NOT STELLARIUM_SPLASH)43IF(NOT STELLARIUM_SPLASH)
44 SET(STELLARIUM_SPLASH Development CACHE STRING "Choose the type of Stellarium's splash image, options are: Release Development ReleaseCandidate." FORCE)44 SET(STELLARIUM_SPLASH Release CACHE STRING "Choose the type of Stellarium's splash image, options are: Release Development ReleaseCandidate." FORCE)
45ENDIF()45ENDIF()
46ADD_DEFINITIONS(-DSTELLARIUM_SPLASH="${STELLARIUM_SPLASH}")46ADD_DEFINITIONS(-DSTELLARIUM_SPLASH="${STELLARIUM_SPLASH}")
4747
4848
=== modified file 'src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp'
--- src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp 2012-09-03 23:57:19 +0000
+++ src/core/renderer/StelQGLInterleavedArrayVertexBufferBackend.cpp 2013-04-28 18:32:26 +0000
@@ -47,7 +47,7 @@
4747
48StelQGLInterleavedArrayVertexBufferBackend::~StelQGLInterleavedArrayVertexBufferBackend()48StelQGLInterleavedArrayVertexBufferBackend::~StelQGLInterleavedArrayVertexBufferBackend()
49{49{
50 delete vertices;50 std::free(vertices);
51 if(NULL != projectedPositions)51 if(NULL != projectedPositions)
52 {52 {
53 std::free(projectedPositions);53 std::free(projectedPositions);