projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CMakeLists.txt: Enable unit tests by default.
[pulseview.git]
/
pv
/
data
/
logicsegment.cpp
diff --git
a/pv/data/logicsegment.cpp
b/pv/data/logicsegment.cpp
index 2df64bb2769955e8182050edf63deb86bfb3e1c9..30e4e67dcecced37fa8267b489c9364363e1223a 100644
(file)
--- a/
pv/data/logicsegment.cpp
+++ b/
pv/data/logicsegment.cpp
@@
-27,7
+27,7
@@
#include "logicsegment.hpp"
#include "logicsegment.hpp"
-#include <libsigrok
/libsigrok
.hpp>
+#include <libsigrok
cxx/libsigrokcxx
.hpp>
using std::lock_guard;
using std::recursive_mutex;
using std::lock_guard;
using std::recursive_mutex;
@@
-306,7
+306,7
@@
void LogicSegment::get_subsampled_edges(
// We cannot fast-forward if there is no mip-map data at
// at the minimum level.
// We cannot fast-forward if there is no mip-map data at
// at the minimum level.
- fast_forward = (mip_map_[level].data !=
NULL
);
+ fast_forward = (mip_map_[level].data !=
nullptr
);
if (min_length < MipMapScaleFactor)
{
if (min_length < MipMapScaleFactor)
{