pulseview-build.patch

   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
   3 @@ -172,7 +172,7 @@
   4  void SigSession::feed_in_header(const sr_dev_inst *sdi)
   5  {
   6         shared_ptr<view::Signal> signal;
   7 -       uint64_t *sample_rate;
   8 +       uint64_t *sample_rate = NULL;
   9         unsigned int logic_probe_count = 0;
  10         unsigned int analog_probe_count = 0;
  11
  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
  14 @@ -104,11 +104,6 @@
  15         }
  16  }
  17
  18 -void Viewport::mouseReleaseEvent(QMouseEvent *event)
  19 -{
  20 -       assert(event);
  21 -}
  22 -
  23  void Viewport::wheelEvent(QWheelEvent *event)
  24  {
  25         assert(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
  28 @@ -48,7 +48,6 @@
  29  private:
  30         void mousePressEvent(QMouseEvent *event);
  31         void mouseMoveEvent(QMouseEvent *event);
  32 -       void mouseReleaseEvent(QMouseEvent *event);
  33         void wheelEvent(QWheelEvent *event);
  34
  35  private:
  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
  38 @@ -35,6 +35,7 @@
  39
  40  set(PULSEVIEW_LINK_LIBS
  41         ${Boost_LIBRARIES}
  42 +       ${CMAKE_THREAD_LIBS_INIT}
  43  )
  44
  45  add_executable(pulseview-test
  46 commit 4b963e7f126d2a13c4a4156fe1cfa8000c00fec0
  47 Author: Joel Holdsworth <joel@airwebreathe.org.uk>
  48 Date:   Sat Mar 9 16:52:04 2013 +0000
  49
  50     Ensure sr_config_get is called even when assert is compiled out
  51
  52 diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
  53 index a9da7bf..8f482f6 100644
  54 --- a/pv/sigsession.cpp
  55 +++ b/pv/sigsession.cpp
  56 @@ -195,8 +195,10 @@ void SigSession::feed_in_header(const sr_dev_inst *sdi)
  57
  58         // Read out the sample rate
  59         assert(sdi->driver);
  60 -       assert(sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
  61 -               (const void**)&sample_rate, sdi) == SR_OK);
  62 +
  63 +       const int ret = sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
  64 +               (const void**)&sample_rate, sdi);
  65 +       assert(ret == SR_OK);
  66
  67         // Create data containers for the coming data snapshots
  68         {