blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 04:20:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #393 from AdenKoperczak/fix_stable_vector_memory_leak

Browse source 
Fix boost::containers::stable_vector memory leak in MapWidget
This commit is contained in:
Dan Paulat 2025-03-15 22:07:25 -05:00 • committed by GitHub
commit 0b820b6d3e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scwx-qt/source/scwx/qt/map/map_widget.cpp
View file

@ -1,3 +1,4 @@
#include <ranges>
#include <scwx/qt/map/map_widget.hpp> #include <scwx/qt/map/map_widget.hpp>
#include <scwx/qt/gl/gl.hpp> #include <scwx/qt/gl/gl.hpp>
#include <scwx/qt/manager/font_manager.hpp> #include <scwx/qt/manager/font_manager.hpp>
@ -204,8 +205,7 @@ public:
const std::vector<MapStyle> emptyStyles_ {}; const std::vector<MapStyle> emptyStyles_ {};
std::vector<MapStyle> customStyles_ { std::vector<MapStyle> customStyles_ {
MapStyle {.name_ {"Custom"}, .url_ {}, .drawBelow_ {}}}; MapStyle {.name_ {"Custom"}, .url_ {}, .drawBelow_ {}}};
QStringList styleLayers_; QStringList styleLayers_;
types::LayerVector customLayers_;
boost::uuids::uuid customStyleUrlChangedCallbackId_ {}; boost::uuids::uuid customStyleUrlChangedCallbackId_ {};
boost::uuids::uuid customStyleDrawBelowChangedCallbackId_ {}; boost::uuids::uuid customStyleDrawBelowChangedCallbackId_ {};
@ -1187,18 +1187,18 @@ void MapWidgetImpl::AddLayers()
placefileLayers_.clear(); placefileLayers_.clear();
// Update custom layer list from model // Update custom layer list from model
customLayers_ = model::LayerModel::Instance()->GetLayers(); types::LayerVector customLayers = model::LayerModel::Instance()->GetLayers();
// Start by drawing layers before any style-defined layers // Start by drawing layers before any style-defined layers
std::string before = styleLayers_.front().toStdString(); std::string before = styleLayers_.front().toStdString();
// Loop through each custom layer in reverse order // Loop through each custom layer in reverse order
for (auto it = customLayers_.crbegin(); it != customLayers_.crend(); ++it) for (const auto& customLayer : std::ranges::reverse_view(customLayers))
{ {
if (it->type_ == types::LayerType::Map) if (customLayer.type_ == types::LayerType::Map)
{ {
// Style-defined map layers // Style-defined map layers
switch (std::get<types::MapLayer>(it->description_)) switch (std::get<types::MapLayer>(customLayer.description_))
{ {
// Subsequent layers are drawn underneath the map symbology layer // Subsequent layers are drawn underneath the map symbology layer
case types::MapLayer::MapUnderlay: case types::MapLayer::MapUnderlay:
@ -1214,10 +1214,12 @@ void MapWidgetImpl::AddLayers()
break; break;
} }
} }
else if (it->displayed_[id_]) // id_ is always < 4, so this is safe
// NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-constant-array-index)
else if (customLayer.displayed_[id_])
{ {
// If the layer is displayed for the current map, add it // If the layer is displayed for the current map, add it
AddLayer(it->type_, it->description_, before); AddLayer(customLayer.type_, customLayer.description_, before);
} }
} }
} }