X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-vivo%2Fsrc%2Fcodecs%2Fsiren.rs;h=79c821b95da7c6048d2cf974515db3bb8d2c6136;hp=3dd130c88066d90c6844c9fa6ed78b5b8a2b6b40;hb=494ad253e745d90795e6e1bbce622e4d2a1ef7e6;hpb=49d0cbfe8fdd3c33658e8d64be24e879cb7849e1 diff --git a/nihav-vivo/src/codecs/siren.rs b/nihav-vivo/src/codecs/siren.rs index 3dd130c..79c821b 100644 --- a/nihav-vivo/src/codecs/siren.rs +++ b/nihav-vivo/src/codecs/siren.rs @@ -203,9 +203,7 @@ impl SirenDecoder { self.power_cat = max_rate_cat; - for i in 0..MAX_RC { - self.cat_balance[i] = temp_cat[max_offset + i]; - } + self.cat_balance[..MAX_RC].copy_from_slice(&temp_cat[max_offset..][..MAX_RC]); for cat in self.cat_balance.iter().take(rate_ctl) { self.power_cat[*cat] += 1; @@ -228,7 +226,7 @@ impl SirenDecoder { 'vec_loop: for i in 0..num_vecs { let ret = br.read_cb(cb); - if let Err(_) = ret { + if ret.is_err() { error = true; break 'vec_loop; }