Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8878adc7bd0d
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 49268ffef3e1
Choose a head ref
  • 1 commit
  • 6 files changed
  • 1 contributor

Commits on Oct 17, 2020

  1. Minor cleanup of issues found with static analysis. Suppressed some f…

    …alse positive warnings.
    azonenberg committed Oct 17, 2020
    Copy the full SHA
    49268ff View commit details
2 changes: 1 addition & 1 deletion lib
Submodule lib updated 187 files
4 changes: 3 additions & 1 deletion src/glscopeclient/ChannelPropertiesDialog.cpp
Original file line number Diff line number Diff line change
@@ -194,7 +194,9 @@ ChannelPropertiesDialog::ChannelPropertiesDialog(
m_centerLabel.set_halign(Gtk::ALIGN_START);
m_grid.attach_next_to(m_centerEntry, m_centerLabel, Gtk::POS_RIGHT, 1, 1);

anchorLabel = &m_centerLabel;
//Commented out to prevent compile warning about unused value.
//Uncomment if adding new widgets later in the dialog.
//anchorLabel = &m_centerLabel;

m_centerEntry.set_text(hz.PrettyPrint(scope->GetCenterFrequency(index)));

2 changes: 1 addition & 1 deletion src/glscopeclient/Framebuffer.cpp
Original file line number Diff line number Diff line change
@@ -36,8 +36,8 @@
#include "Framebuffer.h"

Framebuffer::Framebuffer()
: m_handle(0)
{
m_handle = 0;
}

Framebuffer::~Framebuffer()
3 changes: 1 addition & 2 deletions src/glscopeclient/Shader.cpp
Original file line number Diff line number Diff line change
@@ -38,9 +38,8 @@
using namespace std;

Shader::Shader(GLenum type)
: m_handle(glCreateShader(type))
{
m_handle = glCreateShader(type);

if(m_handle == 0)
LogError("Failed to create shader (of type %d)\n", type);
}
7 changes: 7 additions & 0 deletions src/glscopeclient/WaveformArea.h
Original file line number Diff line number Diff line change
@@ -53,6 +53,13 @@ class WaveformRenderData
, m_channel(channel)
, m_geometryOK(false)
, m_count(0)
, m_mappedXBuffer(NULL)
, m_mappedYBuffer(NULL)
, m_mappedDigitalYBuffer(NULL)
, m_mappedIndexBuffer(NULL)
, m_mappedConfigBuffer(NULL)
, m_mappedConfigBuffer64(NULL)
, m_mappedFloatConfigBuffer(NULL)
{}

bool IsDigital()
5 changes: 4 additions & 1 deletion src/glscopeclient/WaveformArea_rendering.cpp
Original file line number Diff line number Diff line change
@@ -275,7 +275,10 @@ void WaveformArea::GetAllRenderData(std::vector<WaveformRenderData*>& data)
if(overlay.m_channel->GetType() != OscilloscopeChannel::CHANNEL_TYPE_DIGITAL)
continue;

//Create render data if needed
//Create render data if needed.
//Despite what cppcheck says we do have to check before inserting,
//since we're dynamically creating the data being pushed in.
//cppcheck-suppress stlFindInsert
if(m_overlayRenderData.find(overlay) == m_overlayRenderData.end())
{
m_overlayRenderData[overlay] = new WaveformRenderData(overlay, this);