projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Corrected project name in header comments
[pulseview.git]
/
logicdatasnapshot.h
diff --git
a/logicdatasnapshot.h
b/logicdatasnapshot.h
index 630aad431879ebfe90a4df192e304dda174b6ad2..16e8eddef2b22f1ea635e3cb6e38e56dc494734c 100644
(file)
--- a/
logicdatasnapshot.h
+++ b/
logicdatasnapshot.h
@@
-1,5
+1,5
@@
/*
/*
- * This file is part of the
sigrok
project.
+ * This file is part of the
PulseView
project.
*
* Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
*
*
* Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
*
@@
-24,8
+24,11
@@
#include <vector>
namespace LogicDataSnapshotTest {
#include <vector>
namespace LogicDataSnapshotTest {
+ class Pow2;
class Basic;
class LargeData;
class Basic;
class LargeData;
+ class Pulses;
+ class LongPulses;
}
class LogicDataSnapshot : public DataSnapshot
}
class LogicDataSnapshot : public DataSnapshot
@@
-78,13
+81,17
@@
public:
float min_length, int sig_index);
private:
float min_length, int sig_index);
private:
+ uint64_t get_subsample(int level, uint64_t offset) const;
- static in
line int64_t pow2_ceil(int64_t x,
int power);
+ static in
t64_t pow2_ceil(int64_t x, unsigned
int power);
private:
struct MipMapLevel _mip_map[ScaleStepCount];
uint64_t _last_append_sample;
private:
struct MipMapLevel _mip_map[ScaleStepCount];
uint64_t _last_append_sample;
+ friend class LogicDataSnapshotTest::Pow2;
friend class LogicDataSnapshotTest::Basic;
friend class LogicDataSnapshotTest::LargeData;
friend class LogicDataSnapshotTest::Basic;
friend class LogicDataSnapshotTest::LargeData;
+ friend class LogicDataSnapshotTest::Pulses;
+ friend class LogicDataSnapshotTest::LongPulses;
};
};