projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix some clippy warnings
[nihav.git]
/
nihav-qt
/
src
/
codecs
/
qdm2fft.rs
diff --git
a/nihav-qt/src/codecs/qdm2fft.rs
b/nihav-qt/src/codecs/qdm2fft.rs
index 22ca5dc4558d4c53cbc1abf95eceebb6083e8994..2e6082c1452d98b352e20ce9ca7d7b80bfaca3da 100644
(file)
--- a/
nihav-qt/src/codecs/qdm2fft.rs
+++ b/
nihav-qt/src/codecs/qdm2fft.rs
@@
-263,7
+263,7
@@
impl QDM2FFT {
br.read(2) as u8
} else { 0 };
br.read(2) as u8
} else { 0 };
- let mut amp = br.read_code(
&
level_cb)? as i8;
+ let mut amp = br.read_code(level_cb)? as i8;
amp += self.fft_levels[LEVEL_INDEX[pos] as usize] as i8;
if amp < 0 {
amp = 0;
amp += self.fft_levels[LEVEL_INDEX[pos] as usize] as i8;
if amp < 0 {
amp = 0;
@@
-300,7
+300,7
@@
impl QDM2FFT {
match id {
17..=23 => {
let grp = i16::from(self.subsampling) + 4 - i16::from(id - 17);
match id {
17..=23 => {
let grp = i16::from(self.subsampling) + 4 - i16::from(id - 17);
- if
grp >= 0 && grp < 5
{
+ if
(0..5).contains(&grp)
{
self.read_tones(br, grp as usize, false)?;
}
},
self.read_tones(br, grp as usize, false)?;
}
},
@@
-311,7
+311,7
@@
impl QDM2FFT {
},
33..=39 => {
let grp = i16::from(self.subsampling) + 4 - i16::from(id - 33);
},
33..=39 => {
let grp = i16::from(self.subsampling) + 4 - i16::from(id - 33);
- if
grp >= 0 && grp < 5
{
+ if
(0..5).contains(&grp)
{
self.read_tones(br, grp as usize, true)?;
}
},
self.read_tones(br, grp as usize, true)?;
}
},