1 --- pulseview-a7553da/pv/sigsession.cpp~ 2013-03-09 16:09:28.000000000 +0100
2 +++ pulseview-a7553da/pv/sigsession.cpp 2013-03-09 16:45:26.008835730 +0100
4 void SigSession::feed_in_header(const sr_dev_inst *sdi)
6 shared_ptr<view::Signal> signal;
7 - uint64_t *sample_rate;
8 + uint64_t *sample_rate = 0;
9 unsigned int logic_probe_count = 0;
10 unsigned int analog_probe_count = 0;
12 --- pulseview-a7553da/pv/view/viewport.cpp~ 2013-03-09 16:09:28.000000000 +0100
13 +++ pulseview-a7553da/pv/view/viewport.cpp 2013-03-09 17:23:03.369361232 +0100
18 -void Viewport::mouseReleaseEvent(QMouseEvent *event)
23 void Viewport::wheelEvent(QWheelEvent *event)
26 --- pulseview-a7553da/pv/view/viewport.h~ 2013-03-09 16:09:28.000000000 +0100
27 +++ pulseview-a7553da/pv/view/viewport.h 2013-03-09 17:23:07.126116283 +0100
30 void mousePressEvent(QMouseEvent *event);
31 void mouseMoveEvent(QMouseEvent *event);
32 - void mouseReleaseEvent(QMouseEvent *event);
33 void wheelEvent(QWheelEvent *event);
36 --- pulseview-a7553da/test/CMakeLists.txt~ 2013-03-09 16:09:28.000000000 +0100
37 +++ pulseview-a7553da/test/CMakeLists.txt 2013-03-09 17:27:36.806516037 +0100
40 set(PULSEVIEW_LINK_LIBS
42 + ${CMAKE_THREAD_LIBS_INIT}
45 add_executable(pulseview-test