Skip to content

Commit 3ca68e4

Browse files
Add code comments
1 parent 4caf11c commit 3ca68e4

File tree

4 files changed

+4
-19
lines changed

4 files changed

+4
-19
lines changed

plugins/grib_pi/src/GribReader.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,14 @@ void GribReader::clean_all_vectors() {
6060
delete ls;
6161
}
6262
mapGribRecords.clear();
63-
deletedRecords.clear();
6463
}
6564
//-------------------------------------------------------------------------------
6665
void GribReader::clean_vector(std::vector<GribRecord *> &ls) {
6766
std::vector<GribRecord *>::iterator it;
6867
for (it = ls.begin(); it != ls.end(); it++) {
69-
GribRecord *ptr = *it;
70-
wxLogMessage("clean_vector. About to delete ptr: %p. Already deleted: %d", ptr, deletedRecords.find(ptr) != deletedRecords.end());
71-
if(ptr && deletedRecords.find(ptr) == deletedRecords.end()) {
72-
delete ptr;
73-
deletedRecords.insert(ptr);
74-
}
68+
wxLogMessage("clean_vector. About to delete ptr: %p", *it);
69+
delete *it;
70+
*it = NULL;
7571
}
7672
ls.clear();
7773
}

plugins/grib_pi/src/GribReader.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,6 @@ class GribReader {
132132
void clean_vector(std::vector<GribRecord *> &ls);
133133
void clean_all_vectors();
134134
std::vector<GribRecord *> *getFirstNonEmptyList();
135-
// GribRecords can be shared between different vectors in mapGribRecords.
136-
// Several of the storeRecordInMap() calls in readAllGribRecords() can store
137-
// the same GribRecord pointer in multiple vectors.
138-
// This means when we try to clean up in clean_vector(), we could end up with
139-
// double deletes of the same pointer.
140-
// To avoid this, we keep track of which GribRecords have been deleted.
141-
std::set<GribRecord*> deletedRecords;
142135

143136
// Interpolation between 2 GribRecord
144137
double get2GribsInterpolatedValueByDate(double px, double py, time_t date,

plugins/grib_pi/src/GribUIDialog.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,6 @@ GribTimelineRecordSet::GribTimelineRecordSet(unsigned int cnt)
143143
GribTimelineRecordSet::~GribTimelineRecordSet() {
144144
// RemoveGribRecords();
145145
ClearCachedData();
146-
// Delete any remaining GribRecords
147-
for(int i=0; i<Idx_COUNT; i++) {
148-
m_GribRecordPtrArray[i] = NULL;
149-
}
150146
}
151147

152148
void GribTimelineRecordSet::ClearCachedData() {

plugins/grib_pi/src/GribUIDialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ class GRIBFile {
350350
GribReader *m_pGribReader;
351351
time_t m_pRefDateTime;
352352

353-
// An array of GribRecordSets found in this GRIB file
353+
/** An array of GribRecordSets found in this GRIB file. */
354354
ArrayOfGribRecordSets m_GribRecordSetArray;
355355

356356
int m_nGribRecords;

0 commit comments

Comments
 (0)