ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-26 04:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

lazy static for genericgf

Browse Source
This commit is contained in:
Henry Schimke
2022-10-02 11:42:15 -05:00
parent 8e69cfec54
commit 11adc27fe7
5 changed files with 84 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/aztec/decoder.rs
View File

@@ -19,7 +19,7 @@ use encoding::Encoding;
use crate::{
common::{
reedsolomon::{
get_predefined_genericgf, GenericGF, PredefinedGenericGF, ReedSolomonDecoder,
get_predefined_genericgf, GenericGF, PredefinedGenericGF, ReedSolomonDecoder, GenericGFRef,
},
BitMatrix, CharacterSetECI, DecoderRXingResult, DetectorRXingResult,
},
@@ -327,7 +327,7 @@ fn correct_bits(
ddata: &AztecDetectorRXingResult,
rawbits: &[bool],
) -> Result<CorrectedBitsRXingResult, Exceptions> {
let gf: GenericGF;
let gf: GenericGFRef;
let codeword_size;
if ddata.getNbLayers() <= 2 {

4
src/aztec/encoder/encoder.rs
View File

@@ -19,7 +19,7 @@ use encoding::Encoding;
use crate::{
common::{
reedsolomon::{
get_predefined_genericgf, GenericGF, PredefinedGenericGF, ReedSolomonEncoder,
get_predefined_genericgf, GenericGF, PredefinedGenericGF, ReedSolomonEncoder, GenericGFRef,
},
BitArray, BitMatrix,
},
@@ -484,7 +484,7 @@ fn bitsToWords(stuffedBits: &BitArray, wordSize: usize, totalWords: usize) -> Ve
return message;
}
fn getGF(wordSize: usize) -> Result<GenericGF, Exceptions> {
fn getGF(wordSize: usize) -> Result<GenericGFRef, Exceptions> {
match wordSize {
4 => Ok(get_predefined_genericgf(PredefinedGenericGF::AztecParam)),
6 => Ok(get_predefined_genericgf(PredefinedGenericGF::AztecData6)),