projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a way to generate a tarball without requiring git
[pulseview.git]
/
pv
/
data
/
logicsnapshot.cpp
diff --git
a/pv/data/logicsnapshot.cpp
b/pv/data/logicsnapshot.cpp
index 9b3eedd107ad31f33eab0f0ef45950cb06a0cae0..a7a84cf916d1cad33d4f16fb60d7c45b3fbfacd0 100644
(file)
--- a/
pv/data/logicsnapshot.cpp
+++ b/
pv/data/logicsnapshot.cpp
@@
-60,10
+60,11
@@
void LogicSnapshot::append_payload(
const sr_datafeed_logic &logic)
{
assert(_unit_size == logic.unitsize);
const sr_datafeed_logic &logic)
{
assert(_unit_size == logic.unitsize);
+ assert((logic.length % _unit_size) == 0);
lock_guard<recursive_mutex> lock(_mutex);
lock_guard<recursive_mutex> lock(_mutex);
- append_data(logic.data, logic.length);
+ append_data(logic.data, logic.length
/ _unit_size
);
// Generate the first mip-map from the data
append_payload_to_mipmap();
// Generate the first mip-map from the data
append_payload_to_mipmap();
@@
-203,7
+204,10
@@
void LogicSnapshot::get_subsampled_edges(
{
//----- Continue to search -----//
level = min_level;
{
//----- Continue to search -----//
level = min_level;
- fast_forward = true;
+
+ // We cannot fast-forward if there is no mip-map data at
+ // at the minimum level.
+ fast_forward = (_mip_map[level].data != NULL);
if (min_length < MipMapScaleFactor)
{
if (min_length < MipMapScaleFactor)
{
@@
-240,7
+244,8
@@
void LogicSnapshot::get_subsampled_edges(
// We can fast forward only if there was no change
const bool sample =
(get_sample(index) & sig_mask) != 0;
// We can fast forward only if there was no change
const bool sample =
(get_sample(index) & sig_mask) != 0;
- fast_forward = last_sample == sample;
+ if (last_sample != sample)
+ fast_forward = false;
}
if (fast_forward) {
}
if (fast_forward) {