projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Corrected signed/unsigned inconsistencies in LogicDataSnapshot
[pulseview.git]
/
pv
/
logicdatasnapshot.h
diff --git
a/pv/logicdatasnapshot.h
b/pv/logicdatasnapshot.h
index 21541202d81cfb6afa8114183f141bbb60dee259..8e494bedccc916d64f883363a59f7e2c1f0ccaf0 100644
(file)
--- a/
pv/logicdatasnapshot.h
+++ b/
pv/logicdatasnapshot.h
@@
-44,7
+44,7
@@
private:
};
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;
static const int MipMapScalePower;
static const int MipMapScaleFactor;
static const float LogMipMapScaleFactor;
@@
-79,13
+79,13
@@
public:
* @param[in] sig_index The index of the signal.
**/
void get_subsampled_edges(std::vector<EdgePair> &edges,
* @param[in] sig_index The index of the signal.
**/
void get_subsampled_edges(std::vector<EdgePair> &edges,
-
int64_t start,
int64_t end,
+
uint64_t start, u
int64_t end,
float min_length, int sig_index);
private:
uint64_t get_subsample(int level, uint64_t offset) const;
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(u
int64_t x, unsigned int power);
private:
struct MipMapLevel _mip_map[ScaleStepCount];
private:
struct MipMapLevel _mip_map[ScaleStepCount];