X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Flogicsegment.cpp;h=30e4e67dcecced37fa8267b489c9364363e1223a;hp=2b9d89bf4398b5ae4c74f72b59fc890be2e34145;hb=cbf0f87e496c9d9157591c94dc445aaa960fe79d;hpb=f3d66e52ed6b454ea7a0662d5e6367e230116a2b

diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp
index 2b9d89bf..30e4e67d 100644
--- a/pv/data/logicsegment.cpp
+++ b/pv/data/logicsegment.cpp
@@ -23,11 +23,11 @@
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
-#include <math.h>
+#include <cmath>
 
 #include "logicsegment.hpp"
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 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.
-		fast_forward = (mip_map_[level].data != NULL);
+		fast_forward = (mip_map_[level].data != nullptr);
 
 		if (min_length < MipMapScaleFactor)
 		{