#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;
// 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)
{