SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

Remove some compilation warnings on linux

Browse Source
This commit is contained in:
teyssieuman
2016-01-06 21:26:58 +01:00
parent 3100bc8dc3
commit a723b459d7
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DSView/pv/data/dsosnapshot.cpp
View File

@@ -237,9 +237,8 @@ void DsoSnapshot::append_payload_to_envelope_levels(bool header)
_envelope_done = true;
}
double DsoSnapshot::cal_vrms(double zero_off, int index) const
double DsoSnapshot::cal_vrms(double zero_off, unsigned int index) const
{
assert(index >= 0);
assert(index < _channel_num);
// root-meam-squart value
@@ -272,9 +271,8 @@ double DsoSnapshot::cal_vrms(double zero_off, int index) const
return vrms;
}
double DsoSnapshot::cal_vmean(int index) const
double DsoSnapshot::cal_vmean(unsigned int index) const
{
assert(index >= 0);
assert(index < _channel_num);
// mean value

4
DSView/pv/data/dsosnapshot.h
View File

@@ -84,8 +84,8 @@ public:
void enable_envelope(bool enable);
double cal_vrms(double zero_off, int index) const;
double cal_vmean(int index) const;
double cal_vrms(double zero_off, unsigned int index) const;
double cal_vmean(unsigned int index) const;
private:
void reallocate_envelope(Envelope &l);