change to using once_cell for lazy init

This commit is contained in:
Henry Schimke
2023-01-05 10:53:55 -06:00
parent d2a4b21808
commit 20764559ae
37 changed files with 556 additions and 608 deletions

View File

@@ -24,11 +24,9 @@ use crate::{
use super::{decoder::Decoder, detector::Detector};
use lazy_static::lazy_static;
use once_cell::sync::Lazy;
lazy_static! {
static ref DECODER: Decoder = Decoder::new();
}
static DECODER: Lazy<Decoder> = Lazy::new(|| Decoder::new());
/**
* This implementation can detect and decode Data Matrix codes in an image.

View File

@@ -15,13 +15,11 @@
*/
use core::fmt;
use lazy_static::lazy_static;
use once_cell::sync::Lazy;
use crate::Exceptions;
lazy_static! {
static ref VERSIONS: Vec<Version> = Version::buildVersions();
}
static VERSIONS: Lazy<Vec<Version>> = Lazy::new(|| Version::buildVersions());
pub type VersionRef = &'static Version;

View File

@@ -18,7 +18,7 @@ use crate::Exceptions;
use super::SymbolInfo;
use lazy_static::lazy_static;
use once_cell::sync::Lazy;
/**
* Error Correction Code for ECC200.
@@ -30,66 +30,68 @@ use lazy_static::lazy_static;
*/
const FACTOR_SETS: [u32; 16] = [5, 7, 10, 11, 12, 14, 18, 20, 24, 28, 36, 42, 48, 56, 62, 68];
lazy_static! {
/**
* Precomputed polynomial factors for ECC 200.
*/
static ref FACTORS: [Vec<u32>; 16] = [
Vec::from([228, 48, 15, 111, 62]),
Vec::from([23, 68, 144, 134, 240, 92, 254]),
Vec::from([28, 24, 185, 166, 223, 248, 116, 255, 110, 61]),
Vec::from([175, 138, 205, 12, 194, 168, 39, 245, 60, 97, 120]),
Vec::from([41, 153, 158, 91, 61, 42, 142, 213, 97, 178, 100, 242]),
Vec::from([
156, 97, 192, 252, 95, 9, 157, 119, 138, 45, 18, 186, 83, 185,
]),
Vec::from([
83, 195, 100, 39, 188, 75, 66, 61, 241, 213, 109, 129, 94, 254, 225, 48, 90, 188,
]),
Vec::from([
15, 195, 244, 9, 233, 71, 168, 2, 188, 160, 153, 145, 253, 79, 108, 82, 27, 174, 186, 172,
]),
Vec::from([
52, 190, 88, 205, 109, 39, 176, 21, 155, 197, 251, 223, 155, 21, 5, 172, 254, 124, 12, 181,
184, 96, 50, 193,
]),
Vec::from([
211, 231, 43, 97, 71, 96, 103, 174, 37, 151, 170, 53, 75, 34, 249, 121, 17, 138, 110, 213,
141, 136, 120, 151, 233, 168, 93, 255,
]),
Vec::from([
245, 127, 242, 218, 130, 250, 162, 181, 102, 120, 84, 179, 220, 251, 80, 182, 229, 18, 2,
4, 68, 33, 101, 137, 95, 119, 115, 44, 175, 184, 59, 25, 225, 98, 81, 112,
]),
Vec::from([
77, 193, 137, 31, 19, 38, 22, 153, 247, 105, 122, 2, 245, 133, 242, 8, 175, 95, 100, 9,
167, 105, 214, 111, 57, 121, 21, 1, 253, 57, 54, 101, 248, 202, 69, 50, 150, 177, 226, 5,
9, 5,
]),
Vec::from([
245, 132, 172, 223, 96, 32, 117, 22, 238, 133, 238, 231, 205, 188, 237, 87, 191, 106, 16,
147, 118, 23, 37, 90, 170, 205, 131, 88, 120, 100, 66, 138, 186, 240, 82, 44, 176, 87, 187,
147, 160, 175, 69, 213, 92, 253, 225, 19,
]),
Vec::from([
175, 9, 223, 238, 12, 17, 220, 208, 100, 29, 175, 170, 230, 192, 215, 235, 150, 159, 36,
223, 38, 200, 132, 54, 228, 146, 218, 234, 117, 203, 29, 232, 144, 238, 22, 150, 201, 117,
62, 207, 164, 13, 137, 245, 127, 67, 247, 28, 155, 43, 203, 107, 233, 53, 143, 46,
]),
Vec::from([
242, 93, 169, 50, 144, 210, 39, 118, 202, 188, 201, 189, 143, 108, 196, 37, 185, 112, 134,
230, 245, 63, 197, 190, 250, 106, 185, 221, 175, 64, 114, 71, 161, 44, 147, 6, 27, 218, 51,
63, 87, 10, 40, 130, 188, 17, 163, 31, 176, 170, 4, 107, 232, 7, 94, 166, 224, 124, 86, 47,
11, 204,
]),
Vec::from([
220, 228, 173, 89, 251, 149, 159, 56, 89, 33, 147, 244, 154, 36, 73, 127, 213, 136, 248,
180, 234, 197, 158, 177, 68, 122, 93, 213, 15, 160, 227, 236, 66, 139, 153, 185, 202, 167,
179, 25, 220, 232, 96, 210, 231, 136, 223, 239, 181, 241, 59, 52, 172, 25, 49, 232, 211,
189, 64, 54, 108, 153, 132, 63, 96, 103, 82, 186,
]),
];
}
static FACTORS: Lazy<[Vec<u32>; 16]> = Lazy::new(|| {
[
Vec::from([228, 48, 15, 111, 62]),
Vec::from([23, 68, 144, 134, 240, 92, 254]),
Vec::from([28, 24, 185, 166, 223, 248, 116, 255, 110, 61]),
Vec::from([175, 138, 205, 12, 194, 168, 39, 245, 60, 97, 120]),
Vec::from([41, 153, 158, 91, 61, 42, 142, 213, 97, 178, 100, 242]),
Vec::from([
156, 97, 192, 252, 95, 9, 157, 119, 138, 45, 18, 186, 83, 185,
]),
Vec::from([
83, 195, 100, 39, 188, 75, 66, 61, 241, 213, 109, 129, 94, 254, 225, 48, 90, 188,
]),
Vec::from([
15, 195, 244, 9, 233, 71, 168, 2, 188, 160, 153, 145, 253, 79, 108, 82, 27, 174, 186,
172,
]),
Vec::from([
52, 190, 88, 205, 109, 39, 176, 21, 155, 197, 251, 223, 155, 21, 5, 172, 254, 124, 12,
181, 184, 96, 50, 193,
]),
Vec::from([
211, 231, 43, 97, 71, 96, 103, 174, 37, 151, 170, 53, 75, 34, 249, 121, 17, 138, 110,
213, 141, 136, 120, 151, 233, 168, 93, 255,
]),
Vec::from([
245, 127, 242, 218, 130, 250, 162, 181, 102, 120, 84, 179, 220, 251, 80, 182, 229, 18,
2, 4, 68, 33, 101, 137, 95, 119, 115, 44, 175, 184, 59, 25, 225, 98, 81, 112,
]),
Vec::from([
77, 193, 137, 31, 19, 38, 22, 153, 247, 105, 122, 2, 245, 133, 242, 8, 175, 95, 100, 9,
167, 105, 214, 111, 57, 121, 21, 1, 253, 57, 54, 101, 248, 202, 69, 50, 150, 177, 226,
5, 9, 5,
]),
Vec::from([
245, 132, 172, 223, 96, 32, 117, 22, 238, 133, 238, 231, 205, 188, 237, 87, 191, 106,
16, 147, 118, 23, 37, 90, 170, 205, 131, 88, 120, 100, 66, 138, 186, 240, 82, 44, 176,
87, 187, 147, 160, 175, 69, 213, 92, 253, 225, 19,
]),
Vec::from([
175, 9, 223, 238, 12, 17, 220, 208, 100, 29, 175, 170, 230, 192, 215, 235, 150, 159,
36, 223, 38, 200, 132, 54, 228, 146, 218, 234, 117, 203, 29, 232, 144, 238, 22, 150,
201, 117, 62, 207, 164, 13, 137, 245, 127, 67, 247, 28, 155, 43, 203, 107, 233, 53,
143, 46,
]),
Vec::from([
242, 93, 169, 50, 144, 210, 39, 118, 202, 188, 201, 189, 143, 108, 196, 37, 185, 112,
134, 230, 245, 63, 197, 190, 250, 106, 185, 221, 175, 64, 114, 71, 161, 44, 147, 6, 27,
218, 51, 63, 87, 10, 40, 130, 188, 17, 163, 31, 176, 170, 4, 107, 232, 7, 94, 166, 224,
124, 86, 47, 11, 204,
]),
Vec::from([
220, 228, 173, 89, 251, 149, 159, 56, 89, 33, 147, 244, 154, 36, 73, 127, 213, 136,
248, 180, 234, 197, 158, 177, 68, 122, 93, 213, 15, 160, 227, 236, 66, 139, 153, 185,
202, 167, 179, 25, 220, 232, 96, 210, 231, 136, 223, 239, 181, 241, 59, 52, 172, 25,
49, 232, 211, 189, 64, 54, 108, 153, 132, 63, 96, 103, 82, 186,
]),
]
});
const MODULO_VALUE: usize = 0x12D;

View File

@@ -16,27 +16,26 @@
use std::rc::Rc;
use lazy_static::lazy_static;
use once_cell::sync::Lazy;
use crate::datamatrix::encoder::{SymbolInfo, SymbolShapeHint};
use super::{high_level_encoder, minimal_encoder, symbol_info, SymbolInfoLookup};
lazy_static! {
/**
/**
* Tests for {@link HighLevelEncoder} and {@link MinimalEncoder}
*/
static ref TEST_SYMBOLS :Vec<SymbolInfo>= vec![
SymbolInfo::new(false, 3, 5, 8, 8, 1),
SymbolInfo::new(false, 5, 7, 10, 10, 1),
/*rect*/ SymbolInfo::new(true, 5, 7, 16, 6, 1),
SymbolInfo::new(false, 8, 10, 12, 12, 1),
/*rect*/ SymbolInfo::new(true, 10, 11, 14, 6, 2),
SymbolInfo::new(false, 13, 0, 0, 0, 1),
SymbolInfo::new(false, 77, 0, 0, 0, 1)
//The last entries are fake entries to test special conditions with C40 encoding
];
}
static TEST_SYMBOLS: Lazy<Vec<SymbolInfo>> = Lazy::new(|| {
vec![
SymbolInfo::new(false, 3, 5, 8, 8, 1),
SymbolInfo::new(false, 5, 7, 10, 10, 1),
/*rect*/ SymbolInfo::new(true, 5, 7, 16, 6, 1),
SymbolInfo::new(false, 8, 10, 12, 12, 1),
/*rect*/ SymbolInfo::new(true, 10, 11, 14, 6, 2),
SymbolInfo::new(false, 13, 0, 0, 0, 1),
SymbolInfo::new(false, 77, 0, 0, 0, 1), //The last entries are fake entries to test special conditions with C40 encoding
]
});
// const SIL: SymbolInfoLookup = SymbolInfoLookup::new();

View File

@@ -19,42 +19,42 @@ use std::fmt;
use crate::{Dimension, Exceptions};
use super::SymbolShapeHint;
use lazy_static::lazy_static;
use once_cell::sync::Lazy;
lazy_static! {
pub(super) static ref PROD_SYMBOLS: Vec<SymbolInfo> = vec![
SymbolInfo::new(false, 3, 5, 8, 8, 1),
SymbolInfo::new(false, 5, 7, 10, 10, 1),
/*rect*/ SymbolInfo::new(true, 5, 7, 16, 6, 1),
SymbolInfo::new(false, 8, 10, 12, 12, 1),
/*rect*/ SymbolInfo::new(true, 10, 11, 14, 6, 2),
SymbolInfo::new(false, 12, 12, 14, 14, 1),
/*rect*/ SymbolInfo::new(true, 16, 14, 24, 10, 1),
SymbolInfo::new(false, 18, 14, 16, 16, 1),
SymbolInfo::new(false, 22, 18, 18, 18, 1),
/*rect*/ SymbolInfo::new(true, 22, 18, 16, 10, 2),
SymbolInfo::new(false, 30, 20, 20, 20, 1),
/*rect*/ SymbolInfo::new(true, 32, 24, 16, 14, 2),
SymbolInfo::new(false, 36, 24, 22, 22, 1),
SymbolInfo::new(false, 44, 28, 24, 24, 1),
/*rect*/ SymbolInfo::new(true, 49, 28, 22, 14, 2),
SymbolInfo::new(false, 62, 36, 14, 14, 4),
SymbolInfo::new(false, 86, 42, 16, 16, 4),
SymbolInfo::new(false, 114, 48, 18, 18, 4),
SymbolInfo::new(false, 144, 56, 20, 20, 4),
SymbolInfo::new(false, 174, 68, 22, 22, 4),
SymbolInfo::with_details(false, 204, 84, 24, 24, 4, 102, 42),
SymbolInfo::with_details(false, 280, 112, 14, 14, 16, 140, 56),
SymbolInfo::with_details(false, 368, 144, 16, 16, 16, 92, 36),
SymbolInfo::with_details(false, 456, 192, 18, 18, 16, 114, 48),
SymbolInfo::with_details(false, 576, 224, 20, 20, 16, 144, 56),
SymbolInfo::with_details(false, 696, 272, 22, 22, 16, 174, 68),
SymbolInfo::with_details(false, 816, 336, 24, 24, 16, 136, 56),
SymbolInfo::with_details(false, 1050, 408, 18, 18, 36, 175, 68),
SymbolInfo::with_details(false, 1304, 496, 20, 20, 36, 163, 62),
SymbolInfo::new_symbol_info_144(),
];
}
pub(super) static PROD_SYMBOLS: Lazy<Vec<SymbolInfo>> = Lazy::new(|| {
vec![
SymbolInfo::new(false, 3, 5, 8, 8, 1),
SymbolInfo::new(false, 5, 7, 10, 10, 1),
/*rect*/ SymbolInfo::new(true, 5, 7, 16, 6, 1),
SymbolInfo::new(false, 8, 10, 12, 12, 1),
/*rect*/ SymbolInfo::new(true, 10, 11, 14, 6, 2),
SymbolInfo::new(false, 12, 12, 14, 14, 1),
/*rect*/ SymbolInfo::new(true, 16, 14, 24, 10, 1),
SymbolInfo::new(false, 18, 14, 16, 16, 1),
SymbolInfo::new(false, 22, 18, 18, 18, 1),
/*rect*/ SymbolInfo::new(true, 22, 18, 16, 10, 2),
SymbolInfo::new(false, 30, 20, 20, 20, 1),
/*rect*/ SymbolInfo::new(true, 32, 24, 16, 14, 2),
SymbolInfo::new(false, 36, 24, 22, 22, 1),
SymbolInfo::new(false, 44, 28, 24, 24, 1),
/*rect*/ SymbolInfo::new(true, 49, 28, 22, 14, 2),
SymbolInfo::new(false, 62, 36, 14, 14, 4),
SymbolInfo::new(false, 86, 42, 16, 16, 4),
SymbolInfo::new(false, 114, 48, 18, 18, 4),
SymbolInfo::new(false, 144, 56, 20, 20, 4),
SymbolInfo::new(false, 174, 68, 22, 22, 4),
SymbolInfo::with_details(false, 204, 84, 24, 24, 4, 102, 42),
SymbolInfo::with_details(false, 280, 112, 14, 14, 16, 140, 56),
SymbolInfo::with_details(false, 368, 144, 16, 16, 16, 92, 36),
SymbolInfo::with_details(false, 456, 192, 18, 18, 16, 114, 48),
SymbolInfo::with_details(false, 576, 224, 20, 20, 16, 144, 56),
SymbolInfo::with_details(false, 696, 272, 22, 22, 16, 174, 68),
SymbolInfo::with_details(false, 816, 336, 24, 24, 16, 136, 56),
SymbolInfo::with_details(false, 1050, 408, 18, 18, 36, 175, 68),
SymbolInfo::with_details(false, 1304, 496, 20, 20, 36, 163, 62),
SymbolInfo::new_symbol_info_144(),
]
});
/**
* Symbol info table for DataMatrix.