Skip to content

Commit 8c44109

Browse files
committed
Merge branch 'master' into dev-session-restore-cleanup
2 parents 30ed2a1 + e2fe9df commit 8c44109

6 files changed

Lines changed: 23 additions & 8 deletions

File tree

.github/workflows/build.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Build PulseView artifacts
2+
3+
on:
4+
push: # When the repo itself has a new commit on the master branch
5+
branches:
6+
- master
7+
tags: # When a new tag was created
8+
workflow_dispatch: # When the workflow was started manually from github
9+
pull_request:
10+
types:
11+
- labeled # When a pull request received a new label (e.g. "provide_binaries")
12+
- synchronize # When a pull request's branch was updated with a new commit
13+
14+
jobs:
15+
call-build-workflow:
16+
name: Sigrok artifact builder
17+
uses: sigrokproject/sigrok-build/.github/workflows/build.yml@master

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
## along with this program. If not, see <http://www.gnu.org/licenses/>.
2020
##
2121

22-
cmake_minimum_required(VERSION 2.8.12)
22+
cmake_minimum_required(VERSION 2.8.12...3.31.5)
2323

2424
project(pulseview C CXX)
2525

manual/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
## along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
##
1919

20-
cmake_minimum_required(VERSION 2.8.12)
20+
cmake_minimum_required(VERSION 2.8.12...3.31.5)
2121

2222
project(PV_MANUAL)
2323

pv/data/decode/decoder.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,6 @@ Decoder::Decoder(const srd_decoder *const dec, uint8_t stack_level) :
8686
}
8787

8888
// Query the annotation rows and reference them by the classes that use them
89-
uint32_t row_count = 0;
90-
for (const GSList *rl = srd_decoder_->annotation_rows; rl; rl = rl->next)
91-
row_count++;
92-
9389
i = 0;
9490
for (const GSList *rl = srd_decoder_->annotation_rows; rl; rl = rl->next) {
9591
const srd_decoder_annotation_row *const srd_row = (srd_decoder_annotation_row *)rl->data;

pv/session.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ void Session::set_device(shared_ptr<devices::Device> device)
628628

629629
signals_changed();
630630

631-
device_ = move(device);
631+
device_ = std::move(device);
632632

633633
try {
634634
device_->open();

pv/views/trace/analogsignal.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@
4848

4949
#include <libsigrokcxx/libsigrokcxx.hpp>
5050

51+
using std::abs;
5152
using std::deque;
5253
using std::div;
5354
using std::div_t;
5455
// Note that "using std::isnan;" is _not_ put here since that would break
5556
// compilation on some platforms. Use "std::isnan()" instead in checks below.
57+
using std::fabs;
5658
using std::max;
5759
using std::make_pair;
5860
using std::min;
@@ -766,7 +768,7 @@ void AnalogSignal::process_next_sample_value(float x, float value)
766768
// Interpolate values to create values for the intermediate pixels
767769
const float start_value = prev_value_at_pixel_;
768770
const float end_value = value;
769-
const int steps = fabs(pixel_pos - current_pixel_pos_);
771+
const int steps = abs(pixel_pos - current_pixel_pos_);
770772
const double gradient = (end_value - start_value) / steps;
771773
for (int i = 0; i < steps; i++) {
772774
if (current_pixel_pos_ + i < 0)

0 commit comments

Comments
 (0)