mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-02 08:49:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixing a memory bug in SpiceManager

Browse Source
This commit is contained in:
Alexander Bock
2015-07-06 22:47:55 +02:00
parent 682e849423
commit 19540a6f21
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/ghoul
+1 -1
Submodule ext/ghoul updated: 7c746d7af3...a61f50a8eb
src/scene/scenegraphnode.cpp
+2 -4
View File
@@ -154,10 +154,8 @@ bool SceneGraphNode::deinitialize() {
_renderable = nullptr;
}
if (_ephemeris) {
delete _ephemeris;
_ephemeris = nullptr;
}
delete _ephemeris;
_ephemeris = nullptr;
for (SceneGraphNode* child : _children) {
child->deinitialize();
src/util/spicemanager.cpp
+6 -5
View File
@@ -954,9 +954,10 @@ bool SpiceManager::getTerminatorEllipse(const int numberOfPoints,
double ephemerisTime,
double& targetEpoch,
glm::dvec3& observerPosition,
std::vector<psc>& terminatorPoints){
double(*tpoints)[3] = new double[numberOfPoints][3];
std::vector<psc>& terminatorPoints)
{
std::vector<std::array<double, 3>> tpoints(numberOfPoints);
// double (*tpoints)[3] = new double[numberOfPoints][3];
edterm_c(terminatorType.c_str(),
lightSource.c_str(),
@@ -968,7 +969,7 @@ bool SpiceManager::getTerminatorEllipse(const int numberOfPoints,
numberOfPoints,
&targetEpoch,
glm::value_ptr(observerPosition),
(double(*)[3])tpoints );
(double(*)[3])tpoints.data() );
bool hasError = checkForError("Error getting " + terminatorType +
"terminator for'" + target + "'");
@@ -980,7 +981,7 @@ bool SpiceManager::getTerminatorEllipse(const int numberOfPoints,
point[3] += 3;
terminatorPoints.push_back(point);
}
return true;
}