From 023688b746b8478824f945579767e1dd53ae218b Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Mon, 17 Apr 2023 18:37:23 -0500 Subject: [PATCH] General GCC compilation fixes --- .../source/scwx/qt/config/county_database.cpp | 2 +- scwx-qt/source/scwx/qt/gl/draw/geo_line.cpp | 4 +- scwx-qt/source/scwx/qt/gl/draw/rectangle.cpp | 2 +- .../scwx/qt/manager/radar_product_manager.cpp | 2 +- .../source/scwx/qt/map/color_table_layer.cpp | 5 ++- scwx-qt/source/scwx/qt/map/map_widget.cpp | 7 +++- scwx-qt/source/scwx/qt/map/overlay_layer.cpp | 9 +---- .../scwx/qt/map/radar_product_layer.cpp | 4 +- .../scwx/qt/model/imgui_context_model.cpp | 2 +- scwx-qt/source/scwx/qt/model/tree_item.cpp | 4 +- .../scwx/qt/settings/settings_interface.cpp | 2 +- scwx-qt/source/scwx/qt/ui/settings_dialog.cpp | 3 ++ scwx-qt/source/scwx/qt/util/font.cpp | 2 +- .../provider/aws_level3_data_provider.cpp | 4 +- wxdata/source/scwx/wsr88d/ar2v_file.cpp | 40 +++++++++---------- .../scwx/wsr88d/rda/digital_radar_data.cpp | 4 +- .../rpg/digital_radial_data_array_packet.cpp | 6 +-- .../wsr88d/rpg/vector_arrow_data_packet.cpp | 4 +- .../scwx/wsr88d/rpg/wind_barb_data_packet.cpp | 4 +- 19 files changed, 57 insertions(+), 53 deletions(-) diff --git a/scwx-qt/source/scwx/qt/config/county_database.cpp b/scwx-qt/source/scwx/qt/config/county_database.cpp index 99bed961..c6fdca8a 100644 --- a/scwx-qt/source/scwx/qt/config/county_database.cpp +++ b/scwx-qt/source/scwx/qt/config/county_database.cpp @@ -29,7 +29,7 @@ static bool initialized_ {false}; static std::unordered_map countyMap_; static std::shared_mutex countyMutex_; -void CountyDatabase::Initialize() +void Initialize() { if (initialized_) { diff --git a/scwx-qt/source/scwx/qt/gl/draw/geo_line.cpp b/scwx-qt/source/scwx/qt/gl/draw/geo_line.cpp index 39567a2d..a009f6bb 100644 --- a/scwx-qt/source/scwx/qt/gl/draw/geo_line.cpp +++ b/scwx-qt/source/scwx/qt/gl/draw/geo_line.cpp @@ -255,8 +255,8 @@ void GeoLine::Impl::Update() const float ty = points_[1].longitude_; // Offset x/y in pixels - const float ox = width_ * 0.5f * std::cosf(angle_); - const float oy = width_ * 0.5f * std::sinf(angle_); + const float ox = width_ * 0.5f * cosf(angle_); + const float oy = width_ * 0.5f * sinf(angle_); // Texture coordinates const float ls = texture_.sLeft_; diff --git a/scwx-qt/source/scwx/qt/gl/draw/rectangle.cpp b/scwx-qt/source/scwx/qt/gl/draw/rectangle.cpp index 9edd9475..eebb333b 100644 --- a/scwx-qt/source/scwx/qt/gl/draw/rectangle.cpp +++ b/scwx-qt/source/scwx/qt/gl/draw/rectangle.cpp @@ -35,8 +35,8 @@ public: z_ {0.0f}, width_ {0.0f}, height_ {0.0f}, - borderColor_ {0, 0, 0, 0}, borderWidth_ {0.0f}, + borderColor_ {0, 0, 0, 0}, fillColor_ {std::nullopt}, shaderProgram_ {nullptr}, uMVPMatrixLocation_(GL_INVALID_INDEX), diff --git a/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp b/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp index 4d2ecaef..d062e67a 100644 --- a/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp +++ b/scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp @@ -362,7 +362,7 @@ RadarProductManager::coordinates(common::RadialSize radialSize) const return p->coordinates1Degree_; } - throw std::exception("Invalid radial size"); + throw std::invalid_argument("Invalid radial size"); } float RadarProductManager::gate_size() const diff --git a/scwx-qt/source/scwx/qt/map/color_table_layer.cpp b/scwx-qt/source/scwx/qt/map/color_table_layer.cpp index e981d650..3b0d89e4 100644 --- a/scwx-qt/source/scwx/qt/map/color_table_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/color_table_layer.cpp @@ -26,12 +26,13 @@ static const auto logger_ = scwx::util::Logger::Create(logPrefix_); class ColorTableLayerImpl { public: - explicit ColorTableLayerImpl(std::shared_ptr context) : + explicit ColorTableLayerImpl() : shaderProgram_(nullptr), uMVPMatrixLocation_(GL_INVALID_INDEX), vbo_ {GL_INVALID_INDEX}, vao_ {GL_INVALID_INDEX}, texture_ {GL_INVALID_INDEX}, + colorTable_ {}, colorTableNeedsUpdate_ {true} { } @@ -50,7 +51,7 @@ public: }; ColorTableLayer::ColorTableLayer(std::shared_ptr context) : - GenericLayer(context), p(std::make_unique(context)) + GenericLayer(context), p(std::make_unique()) { } ColorTableLayer::~ColorTableLayer() = default; diff --git a/scwx-qt/source/scwx/qt/map/map_widget.cpp b/scwx-qt/source/scwx/qt/map/map_widget.cpp index 5a95e00f..5de29c5e 100644 --- a/scwx-qt/source/scwx/qt/map/map_widget.cpp +++ b/scwx-qt/source/scwx/qt/map/map_widget.cpp @@ -502,8 +502,8 @@ void MapWidget::SetMapLocation(double latitude, double longitude, bool updateRadarSite) { - if (p->map_ != nullptr && p->prevLatitude_ != latitude || - p->prevLongitude_ != longitude) + if (p->map_ != nullptr && + (p->prevLatitude_ != latitude || p->prevLongitude_ != longitude)) { // Update the map location p->map_->setCoordinate({latitude, longitude}); @@ -787,6 +787,9 @@ void MapWidget::mapChanged(QMapLibreGL::Map::MapChange mapChange) case QMapLibreGL::Map::MapChangeDidFinishLoadingStyle: AddLayers(); break; + + default: + break; } } diff --git a/scwx-qt/source/scwx/qt/map/overlay_layer.cpp b/scwx-qt/source/scwx/qt/map/overlay_layer.cpp index 735d78e4..bc330960 100644 --- a/scwx-qt/source/scwx/qt/map/overlay_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/overlay_layer.cpp @@ -112,11 +112,6 @@ void OverlayLayer::Render( p->sweepTimeNeedsUpdate_ = false; } - glm::mat4 projection = glm::ortho(0.0f, - static_cast(params.width), - 0.0f, - static_cast(params.height)); - // Active Box p->activeBoxOuter_->SetVisible(settings.isActive_); p->activeBoxInner_->SetVisible(settings.isActive_); @@ -139,7 +134,7 @@ void OverlayLayer::Render( nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_AlwaysAutoResize); - ImGui::Text(productName.c_str()); + ImGui::TextUnformatted(productName.c_str()); ImGui::End(); } } @@ -154,7 +149,7 @@ void OverlayLayer::Render( nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_AlwaysAutoResize); - ImGui::Text(p->sweepTimeString_.c_str()); + ImGui::TextUnformatted(p->sweepTimeString_.c_str()); ImGui::End(); } diff --git a/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp b/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp index c3356a54..f5310f1e 100644 --- a/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp @@ -37,7 +37,7 @@ LatLongToScreenCoordinate(const QMapLibreGL::Coordinate& coordinate); class RadarProductLayerImpl { public: - explicit RadarProductLayerImpl(std::shared_ptr context) : + explicit RadarProductLayerImpl() : shaderProgram_(nullptr), uMVPMatrixLocation_(GL_INVALID_INDEX), uMapScreenCoordLocation_(GL_INVALID_INDEX), @@ -75,7 +75,7 @@ public: }; RadarProductLayer::RadarProductLayer(std::shared_ptr context) : - GenericLayer(context), p(std::make_unique(context)) + GenericLayer(context), p(std::make_unique()) { } RadarProductLayer::~RadarProductLayer() = default; diff --git a/scwx-qt/source/scwx/qt/model/imgui_context_model.cpp b/scwx-qt/source/scwx/qt/model/imgui_context_model.cpp index f045a9b1..37ca523f 100644 --- a/scwx-qt/source/scwx/qt/model/imgui_context_model.cpp +++ b/scwx-qt/source/scwx/qt/model/imgui_context_model.cpp @@ -45,7 +45,7 @@ QVariant ImGuiContextModel::data(const QModelIndex& index, int role) const } const int row = index.row(); - if (row >= p->contexts_.size() || row < 0) + if (row >= static_cast(p->contexts_.size()) || row < 0) { return {}; } diff --git a/scwx-qt/source/scwx/qt/model/tree_item.cpp b/scwx-qt/source/scwx/qt/model/tree_item.cpp index 34e2289b..0d89267f 100644 --- a/scwx-qt/source/scwx/qt/model/tree_item.cpp +++ b/scwx-qt/source/scwx/qt/model/tree_item.cpp @@ -81,7 +81,7 @@ int TreeItem::column_count() const QVariant TreeItem::data(int column) const { - if (0 <= column && column < p->itemData_.size()) + if (0 <= column && column < static_cast(p->itemData_.size())) { return p->itemData_[column]; } @@ -152,7 +152,7 @@ bool TreeItem::InsertChildren(int position, int count, int columns) bool TreeItem::SetData(int column, const QVariant& value) { - if (column < 0 || column >= p->itemData_.size()) + if (column < 0 || column >= static_cast(p->itemData_.size())) { return false; } diff --git a/scwx-qt/source/scwx/qt/settings/settings_interface.cpp b/scwx-qt/source/scwx/qt/settings/settings_interface.cpp index f457953a..dd729da0 100644 --- a/scwx-qt/source/scwx/qt/settings/settings_interface.cpp +++ b/scwx-qt/source/scwx/qt/settings/settings_interface.cpp @@ -164,7 +164,7 @@ void SettingsInterface::SetEditWidget(QWidget* widget) { // Error value value.push_back( - std::numeric_limits::min()); + std::numeric_limits::min()); } } } diff --git a/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp b/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp index a4a96181..02c82b44 100644 --- a/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp +++ b/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp @@ -235,6 +235,9 @@ void SettingsDialogImpl::ConnectSignals() case QDialogButtonBox::ButtonRole::ResetRole: // Restore Defaults ResetToDefault(); break; + + default: + break; } }); } diff --git a/scwx-qt/source/scwx/qt/util/font.cpp b/scwx-qt/source/scwx/qt/util/font.cpp index 936df3f8..ce87714c 100644 --- a/scwx-qt/source/scwx/qt/util/font.cpp +++ b/scwx-qt/source/scwx/qt/util/font.cpp @@ -285,7 +285,7 @@ void FontImpl::CreateImGuiFont(QFile& fontFile, strncpy(fontConfig.Name, fmt::format("{}:{}", fileInfo.fileName().toStdString(), fontSize) .c_str(), - sizeof(fontConfig.Name)); + sizeof(fontConfig.Name) - 1); fontConfig.Name[sizeof(fontConfig.Name) - 1] = 0; // Add font to atlas diff --git a/wxdata/source/scwx/provider/aws_level3_data_provider.cpp b/wxdata/source/scwx/provider/aws_level3_data_provider.cpp index 49014196..88c28c93 100644 --- a/wxdata/source/scwx/provider/aws_level3_data_provider.cpp +++ b/wxdata/source/scwx/provider/aws_level3_data_provider.cpp @@ -158,13 +158,15 @@ void AwsLevel3DataProvider::Impl::ListProducts() logger_->debug("ListProducts()"); + static const std::string delimiter {"_"}; + // Prefix format: GGG_ const std::string prefix = fmt::format("{0}_", siteId_); Aws::S3::Model::ListObjectsV2Request request; request.SetBucket(bucketName_); request.SetPrefix(prefix); - request.SetDelimiter("_"); + request.SetDelimiter(delimiter); auto outcome = self_->client()->ListObjectsV2(request); diff --git a/wxdata/source/scwx/wsr88d/ar2v_file.cpp b/wxdata/source/scwx/wsr88d/ar2v_file.cpp index e2d7e8e2..87d4a37f 100644 --- a/wxdata/source/scwx/wsr88d/ar2v_file.cpp +++ b/wxdata/source/scwx/wsr88d/ar2v_file.cpp @@ -33,35 +33,35 @@ class Ar2vFileImpl { public: explicit Ar2vFileImpl() : - tapeFilename_(), - extensionNumber_(), + tapeFilename_ {}, + extensionNumber_ {}, julianDate_ {0}, milliseconds_ {0}, - icao_(), - rawRecords_(), + icao_ {}, vcpData_ {nullptr}, radarData_ {}, - index_ {} {}; + index_ {}, + rawRecords_ {} {}; ~Ar2vFileImpl() = default; - size_t DecompressLDMRecords(std::istream& is); - void HandleMessage(std::shared_ptr& message); - void IndexFile(); - void ParseLDMRecords(); - void ParseLDMRecord(std::istream& is); - void ProcessRadarData(std::shared_ptr message); + std::size_t DecompressLDMRecords(std::istream& is); + void HandleMessage(std::shared_ptr& message); + void IndexFile(); + void ParseLDMRecords(); + void ParseLDMRecord(std::istream& is); + void ProcessRadarData(std::shared_ptr message); - std::string tapeFilename_; - std::string extensionNumber_; - uint32_t julianDate_; - uint32_t milliseconds_; - std::string icao_; + std::string tapeFilename_; + std::string extensionNumber_; + std::uint32_t julianDate_; + std::uint32_t milliseconds_; + std::string icao_; - std::shared_ptr vcpData_; - std::map> radarData_; + std::shared_ptr vcpData_; + std::map> radarData_; std::map>> + std::map>> index_; std::list rawRecords_; @@ -70,7 +70,7 @@ public: Ar2vFile::Ar2vFile() : p(std::make_unique()) {} Ar2vFile::~Ar2vFile() = default; -Ar2vFile::Ar2vFile(Ar2vFile&&) noexcept = default; +Ar2vFile::Ar2vFile(Ar2vFile&&) noexcept = default; Ar2vFile& Ar2vFile::operator=(Ar2vFile&&) noexcept = default; uint32_t Ar2vFile::julian_date() const diff --git a/wxdata/source/scwx/wsr88d/rda/digital_radar_data.cpp b/wxdata/source/scwx/wsr88d/rda/digital_radar_data.cpp index 4fc02e7c..b31955a7 100644 --- a/wxdata/source/scwx/wsr88d/rda/digital_radar_data.cpp +++ b/wxdata/source/scwx/wsr88d/rda/digital_radar_data.cpp @@ -43,7 +43,7 @@ DataBlock::DataBlock(const std::string& dataBlockType, } DataBlock::~DataBlock() = default; -DataBlock::DataBlock(DataBlock&&) noexcept = default; +DataBlock::DataBlock(DataBlock&&) noexcept = default; DataBlock& DataBlock::operator=(DataBlock&&) noexcept = default; class MomentDataBlockImpl @@ -198,7 +198,7 @@ bool MomentDataBlock::Parse(std::istream& is) p->scale_ = awips::Message::SwapFloat(p->scale_); p->offset_ = awips::Message::SwapFloat(p->offset_); - if (p->numberOfDataMomentGates_ >= 0 && p->numberOfDataMomentGates_ <= 1840) + if (p->numberOfDataMomentGates_ <= 1840) { if (p->dataWordSize_ == 8) { diff --git a/wxdata/source/scwx/wsr88d/rpg/digital_radial_data_array_packet.cpp b/wxdata/source/scwx/wsr88d/rpg/digital_radial_data_array_packet.cpp index 359c8947..5b9079df 100644 --- a/wxdata/source/scwx/wsr88d/rpg/digital_radial_data_array_packet.cpp +++ b/wxdata/source/scwx/wsr88d/rpg/digital_radial_data_array_packet.cpp @@ -64,7 +64,7 @@ DigitalRadialDataArrayPacket::DigitalRadialDataArrayPacket() : DigitalRadialDataArrayPacket::~DigitalRadialDataArrayPacket() = default; DigitalRadialDataArrayPacket::DigitalRadialDataArrayPacket( - DigitalRadialDataArrayPacket&&) noexcept = default; + DigitalRadialDataArrayPacket&&) noexcept = default; DigitalRadialDataArrayPacket& DigitalRadialDataArrayPacket::operator=( DigitalRadialDataArrayPacket&&) noexcept = default; @@ -158,13 +158,13 @@ bool DigitalRadialDataArrayPacket::Parse(std::istream& is) logger_->warn("Invalid packet code: {}", p->packetCode_); blockValid = false; } - if (p->indexOfFirstRangeBin_ < 0 || p->indexOfFirstRangeBin_ > 230) + if (p->indexOfFirstRangeBin_ > 230) { logger_->warn("Invalid index of first range bin: {}", p->indexOfFirstRangeBin_); blockValid = false; } - if (p->numberOfRangeBins_ < 0 || p->numberOfRangeBins_ > 1840) + if (p->numberOfRangeBins_ > 1840) { logger_->warn("Invalid number of range bins: {}", p->numberOfRangeBins_); diff --git a/wxdata/source/scwx/wsr88d/rpg/vector_arrow_data_packet.cpp b/wxdata/source/scwx/wsr88d/rpg/vector_arrow_data_packet.cpp index 06a15d39..e1412a26 100644 --- a/wxdata/source/scwx/wsr88d/rpg/vector_arrow_data_packet.cpp +++ b/wxdata/source/scwx/wsr88d/rpg/vector_arrow_data_packet.cpp @@ -102,11 +102,11 @@ bool VectorArrowDataPacket::Parse(std::istream& is) // The number of vectors is equal to the size divided by the number of bytes // in a vector - size_t vectorCount = p->lengthOfBlock_ / 10; + std::size_t vectorCount = p->lengthOfBlock_ / 10; p->arrow_.resize(vectorCount); - for (int v = 0; v < vectorCount && !is.eof(); v++) + for (std::size_t v = 0; v < vectorCount && !is.eof(); v++) { VectorArrow& arrow = p->arrow_[v]; diff --git a/wxdata/source/scwx/wsr88d/rpg/wind_barb_data_packet.cpp b/wxdata/source/scwx/wsr88d/rpg/wind_barb_data_packet.cpp index ae9fb2cc..7b07b9f4 100644 --- a/wxdata/source/scwx/wsr88d/rpg/wind_barb_data_packet.cpp +++ b/wxdata/source/scwx/wsr88d/rpg/wind_barb_data_packet.cpp @@ -101,11 +101,11 @@ bool WindBarbDataPacket::Parse(std::istream& is) // The number of vectors is equal to the size divided by the number of bytes // in a vector - size_t vectorCount = p->lengthOfBlock_ / 10; + std::size_t vectorCount = p->lengthOfBlock_ / 10; p->windBarb_.resize(vectorCount); - for (int v = 0; v < vectorCount && !is.eof(); v++) + for (std::size_t v = 0; v < vectorCount && !is.eof(); v++) { WindBarb& windBarb = p->windBarb_[v];