X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Flogicdatasnapshot.h;h=2a18835fe01eb441b98f2314276b67bca898e20b;hp=21541202d81cfb6afa8114183f141bbb60dee259;hb=5b7cf66c34d7beeef055b06b95d72f9d7a3de680;hpb=51e77110d4316fd0106f8306f5e1f0523c5bf7d7 diff --git a/pv/logicdatasnapshot.h b/pv/logicdatasnapshot.h index 21541202..2a18835f 100644 --- a/pv/logicdatasnapshot.h +++ b/pv/logicdatasnapshot.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef PULSEVIEW_PV_LOGICDATASNAPSHOT_H +#define PULSEVIEW_PV_LOGICDATASNAPSHOT_H + #include "datasnapshot.h" #include @@ -44,7 +47,7 @@ private: }; private: - static const int ScaleStepCount = 10; + static const unsigned int ScaleStepCount = 10; static const int MipMapScalePower; static const int MipMapScaleFactor; static const float LogMipMapScaleFactor; @@ -79,13 +82,13 @@ public: * @param[in] sig_index The index of the signal. **/ void get_subsampled_edges(std::vector &edges, - int64_t start, int64_t end, + uint64_t start, uint64_t end, float min_length, int sig_index); private: uint64_t get_subsample(int level, uint64_t offset) const; - static int64_t pow2_ceil(int64_t x, unsigned int power); + static uint64_t pow2_ceil(uint64_t x, unsigned int power); private: struct MipMapLevel _mip_map[ScaleStepCount]; @@ -99,3 +102,5 @@ private: }; } // namespace pv + +#endif // PULSEVIEW_PV_LOGICDATASNAPSHOT_H