ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-27 21:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

partial move to use::crate

Browse Source
This commit is contained in:
Henry Schimke
2022-08-14 18:50:29 -05:00
parent 5d5280abfd
commit a4a943ee15
19 changed files with 58 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/aztec.rs
View File

@@ -8,7 +8,7 @@ use crate::{BarcodeFormat,BinaryBitmap,DecodeHintType,FormatException,NotFoundEx
use crate::aztec::decoder::Decoder; use crate::aztec::decoder::Decoder;
use crate::aztec::detector::Detector; use crate::aztec::detector::Detector;
use crate::aztec::encoder{AztecCode,Encoder}; use crate::aztec::encoder::{AztecCode,Encoder};
// AztecDetectorResult.java // AztecDetectorResult.java

12
src/aztec/decoder.rs
View File

@@ -1,11 +1,7 @@
import com.google.zxing.FormatException; use create::FormatException;
import com.google.zxing.aztec.AztecDetectorResult; use crate::aztec::AztecDetectorResult;
import com.google.zxing.common.BitMatrix; use crate::common::{BitMatrix,CharacterSetECI,DecoderResult};
import com.google.zxing.common.CharacterSetECI; use crate::common::reedsolomon::{GenericGF,ReedSolomonDecoder,ReedSolomonException};
import com.google.zxing.common.DecoderResult;
import com.google.zxing.common.reedsolomon.GenericGF;
import com.google.zxing.common.reedsolomon.ReedSolomonDecoder;
import com.google.zxing.common.reedsolomon.ReedSolomonException;
/** /**
* <p>The main class which implements Aztec Code decoding -- as opposed to locating and extracting * <p>The main class which implements Aztec Code decoding -- as opposed to locating and extracting

15
src/aztec/detector.rs
View File

@@ -1,13 +1,8 @@
import com.google.zxing.NotFoundException; use crate::{NotFoundException,ResultPoint};
import com.google.zxing.ResultPoint; use crate::aztec::AztecDetectorResult;
import com.google.zxing.aztec.AztecDetectorResult; use crate::common::{BitMatrix,GridSampler};
import com.google.zxing.common.BitMatrix; use crate::common::detector::{MathUtils,WhiteRectangleDetector};
import com.google.zxing.common.GridSampler; use crate::common::reedsolomon::{GenericGF,ReedSolomonDecoder,ReedSolomonException};
import com.google.zxing.common.detector.MathUtils;
import com.google.zxing.common.detector.WhiteRectangleDetector;
import com.google.zxing.common.reedsolomon.GenericGF;
import com.google.zxing.common.reedsolomon.ReedSolomonDecoder;
import com.google.zxing.common.reedsolomon.ReedSolomonException;
/** /**

2
src/aztec/encoder.rs
View File

@@ -1,5 +1,5 @@
use crate::common::{BitArray,BitMatrix,CharacterSetECI}; use crate::common::{BitArray,BitMatrix,CharacterSetECI};
use crate::common::reedsolomon{GenericGF,ReedSolomonEncoder}; use crate::common::reedsolomon::{GenericGF,ReedSolomonEncoder};
// Token.java // Token.java
const EMPTY: Token = SimpleToken::new(null, 0, 0); const EMPTY: Token = SimpleToken::new(null, 0, 0);

33
src/datamatrix.rs
View File

@@ -1,31 +1,10 @@
import com.google.zxing.BarcodeFormat; use crate::{BarcodeFormat,BinaryBitmap,DecodeHintType,ChecksumException,FormatException,NotFoundException,Reader,RXingResult,ResultMetadataType,ResultPoint,EncodeHintType,Writer,Dimension};
import com.google.zxing.BinaryBitmap; use crate::common::{DecoderResult,BitMatrix,DetectorResult,};
import com.google.zxing.ChecksumException; use crate::datamatrix::decoder::{Decoder};
import com.google.zxing.DecodeHintType; use crate::datamatrix::detector::{Detector};
import com.google.zxing.FormatException; use crate::datamatrix::encoder::{DefaultPlacement,ErrorCorrection,HighLevelEncoder,MinimalEncoder,SymbolInfo,SymbolShapeHint};
import com.google.zxing.NotFoundException; use crate::qrcode::encoder::ByteMatrix;
import com.google.zxing.Reader;
import com.google.zxing.Result;
import com.google.zxing.ResultMetadataType;
import com.google.zxing.ResultPoint;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.common.DecoderResult;
import com.google.zxing.common.DetectorResult;
import com.google.zxing.datamatrix.decoder.Decoder;
import com.google.zxing.datamatrix.detector.Detector;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
import com.google.zxing.Writer;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.datamatrix.encoder.DefaultPlacement;
import com.google.zxing.Dimension;
import com.google.zxing.datamatrix.encoder.ErrorCorrection;
import com.google.zxing.datamatrix.encoder.HighLevelEncoder;
import com.google.zxing.datamatrix.encoder.MinimalEncoder;
import com.google.zxing.datamatrix.encoder.SymbolInfo;
import com.google.zxing.datamatrix.encoder.SymbolShapeHint;
import com.google.zxing.qrcode.encoder.ByteMatrix;
// DataMatrixReader.java // DataMatrixReader.java
/** /**

20
src/datamatrix/decoder.rs
View File

@@ -1,21 +1,7 @@
// use crate::{FormatException,ChecksumException,FormatException};
use crate::common::{BitMatrix,DecoderResult,BitSource,ECIStringBuilder};
use crate::common::reedsolomon::{GenericGF,ReedSolomonDecoder,ReedSolomonException};
import com.google.zxing.FormatException;
import com.google.zxing.ChecksumException;
import com.google.zxing.FormatException;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.common.DecoderResult;
import com.google.zxing.common.reedsolomon.GenericGF;
import com.google.zxing.common.reedsolomon.ReedSolomonDecoder;
import com.google.zxing.common.reedsolomon.ReedSolomonException;
import com.google.zxing.FormatException;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.FormatException;
import com.google.zxing.common.BitSource;
import com.google.zxing.common.DecoderResult;
import com.google.zxing.common.ECIStringBuilder;
// BitMatrixParser.java // BitMatrixParser.java
/** /**

9
src/datamatrix/detector.rs
View File

@@ -1,9 +1,6 @@
import com.google.zxing.NotFoundException; use crate::{NotFoundException,ResultPoint};
import com.google.zxing.ResultPoint; use crate::common::{BitMatrix,DetectorResult,GridSampler};
import com.google.zxing.common.BitMatrix; use crate::common::detector::WhiteRectangleDetector;
import com.google.zxing.common.DetectorResult;
import com.google.zxing.common.GridSampler;
import com.google.zxing.common.detector.WhiteRectangleDetector;
// Detector.java // Detector.java
/** /**

4
src/datamatrix/encoder.rs
View File

@@ -1,5 +1,5 @@
import com.google.zxing.Dimension; use crate::Dimension;
import com.google.zxing.common.MinimalECIInput; use crate::common::MinimalECIInput;
// ASCIIEncoder.java // ASCIIEncoder.java

2
src/multi/qrcode.rs
View File

@@ -1,5 +1,5 @@
use crate::{BarcodeFormat,BinaryBitmap,DecodeHintType,NotFoundException,ReaderException,RXingResult,ResultMetadataType,ResultPoint}; use crate::{BarcodeFormat,BinaryBitmap,DecodeHintType,NotFoundException,ReaderException,RXingResult,ResultMetadataType,ResultPoint};
use crate::common{DecoderResult,DetectorResult}; use crate::common::{DecoderResult,DetectorResult};
use crate::multi::{MultipleBarcodeReader}; use crate::multi::{MultipleBarcodeReader};
use crate::multi::qrcode::detector::MultiDetector; use crate::multi::qrcode::detector::MultiDetector;
use create::qrcode::{QRCodeReader}; use create::qrcode::{QRCodeReader};

19
src/oned/rss.rs
View File

@@ -1,18 +1,7 @@
import com.google.zxing.NotFoundException; use crate::{NotFoundException,ResultPoint,BarcodeFormat,DecodeHintType,NotFoundException,RXingResult,ResultMetadataType,ResultPoint,ResultPointCallback};
import com.google.zxing.common.detector.MathUtils; use crate::common::BitArray;
import com.google.zxing.oned.OneDReader; use crate::common::detector::{MathUtils};
use crate::oned::{OneDReader};
import com.google.zxing.ResultPoint;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.DecodeHintType;
import com.google.zxing.NotFoundException;
import com.google.zxing.Result;
import com.google.zxing.ResultMetadataType;
import com.google.zxing.ResultPoint;
import com.google.zxing.ResultPointCallback;
import com.google.zxing.common.BitArray;
import com.google.zxing.common.detector.MathUtils;

22
src/oned/rss/expanded.rs
View File

@@ -1,22 +1,8 @@
import com.google.zxing.common.BitArray; use crate::{BarcodeFormat,DecodeHintType,FormatException,NotFoundException,RXingResult,ResultMetadataType,ResultPoint};
use crate::common::BitArray;
use crate::oned::rss::{DataCharacter,FinderPattern,AbstractRSSReader,RSSUtils};
use crate::oned::rss::expanded::decoders::AbstractExpandedDecoder;
import com.google.zxing.oned.rss.DataCharacter;
import com.google.zxing.oned.rss.FinderPattern;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.DecodeHintType;
import com.google.zxing.FormatException;
import com.google.zxing.NotFoundException;
import com.google.zxing.Result;
import com.google.zxing.ResultMetadataType;
import com.google.zxing.ResultPoint;
import com.google.zxing.common.BitArray;
import com.google.zxing.common.detector.MathUtils;
import com.google.zxing.oned.rss.AbstractRSSReader;
import com.google.zxing.oned.rss.DataCharacter;
import com.google.zxing.oned.rss.FinderPattern;
import com.google.zxing.oned.rss.RSSUtils;
import com.google.zxing.oned.rss.expanded.decoders.AbstractExpandedDecoder;
// NEW FILE: bit_array_builder.rs // NEW FILE: bit_array_builder.rs
/* /*

14
src/oned/rss/expanded/decoders.rs
View File

@@ -1,15 +1,5 @@
import com.google.zxing.FormatException; use crate::{FormatException,NotFoundException};
import com.google.zxing.NotFoundException; use crate::common::BitArray;
import com.google.zxing.common.BitArray;
import com.google.zxing.FormatException;
import com.google.zxing.NotFoundException;
import com.google.zxing.common.BitArray;
import com.google.zxing.NotFoundException;
import com.google.zxing.common.BitArray;
import com.google.zxing.FormatException;

32
src/pdf417/decoder.rs
View File

@@ -1,31 +1,9 @@
import com.google.zxing.pdf417.PDF417Common; use crate::pdf417::decoder::ec::ErrorCorrection;
use crate::common::detector::MathUtils;
use crate::common::{BitMatrix,ECIStringBuilder,DecoderResult};
use crate::{NotFoundException,ResultPoint,FormatException,ChecksumException,};
use crate::pdf417::{PDF417Common,PDF417ResultMetadata};
import com.google.zxing.NotFoundException;
import com.google.zxing.ResultPoint;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.FormatException;
import com.google.zxing.common.ECIStringBuilder;
import com.google.zxing.common.DecoderResult;
import com.google.zxing.pdf417.PDF417ResultMetadata;
import com.google.zxing.pdf417.PDF417Common;
import com.google.zxing.ResultPoint;
import com.google.zxing.pdf417.PDF417Common;
import com.google.zxing.common.detector.MathUtils;
import com.google.zxing.pdf417.PDF417Common;
import com.google.zxing.ChecksumException;
import com.google.zxing.FormatException;
import com.google.zxing.NotFoundException;
import com.google.zxing.ResultPoint;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.common.DecoderResult;
import com.google.zxing.common.detector.MathUtils;
import com.google.zxing.pdf417.PDF417Common;
import com.google.zxing.pdf417.decoder.ec.ErrorCorrection;
// NEW FILE: barcode_metadata.rs // NEW FILE: barcode_metadata.rs
/* /*

6
src/pdf417/decoder/ec.rs
View File

@@ -1,7 +1,5 @@
import com.google.zxing.ChecksumException; use crate::ChecksumException;
use crate::pdf417::PDF417Common;
import com.google.zxing.pdf417.PDF417Common;

12
src/pdf417/detector.rs
View File

@@ -1,13 +1,5 @@
use crate::{BinaryBitmap,NotFoundException,DecodeHintType,ResultPoint};
import com.google.zxing.BinaryBitmap; use crate::common::BitMatrix;
import com.google.zxing.DecodeHintType;
import com.google.zxing.NotFoundException;
import com.google.zxing.ResultPoint;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.ResultPoint;
import com.google.zxing.common.BitMatrix;
// NEW FILE: detector.rs // NEW FILE: detector.rs
/* /*

9
src/pdf417/encoder.rs
View File

@@ -1,10 +1,5 @@
import com.google.zxing.WriterException; use crate::{WriterException,};
use crate::common::{CharacterSetECI,ECIInput,MinimalECIInput};
import com.google.zxing.WriterException;
import com.google.zxing.common.CharacterSetECI;
import com.google.zxing.common.ECIInput;
import com.google.zxing.common.MinimalECIInput;
// NEW FILE: barcode_matrix.rs // NEW FILE: barcode_matrix.rs

34
src/qrcode/decoder.rs
View File

@@ -1,34 +1,6 @@
import com.google.zxing.FormatException; use crate::{FormatException,DecodeHintType,ChecksumException,ResultPoint};
import com.google.zxing.common.BitMatrix; use crate::comon::{BitMatrix,BitSource,CharacterSetECI,DecoderResult,StringUtils};
use crate::common::reedsolomon::{GenericGF,ReedSolomonDecoder,ReedSolomonException};
import com.google.zxing.common.BitMatrix;
import com.google.zxing.DecodeHintType;
import com.google.zxing.FormatException;
import com.google.zxing.common.BitSource;
import com.google.zxing.common.CharacterSetECI;
import com.google.zxing.common.DecoderResult;
import com.google.zxing.common.StringUtils;
import com.google.zxing.ChecksumException;
import com.google.zxing.DecodeHintType;
import com.google.zxing.FormatException;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.common.DecoderResult;
import com.google.zxing.common.reedsolomon.GenericGF;
import com.google.zxing.common.reedsolomon.ReedSolomonDecoder;
import com.google.zxing.common.reedsolomon.ReedSolomonException;
import com.google.zxing.ResultPoint;
import com.google.zxing.FormatException;
import com.google.zxing.common.BitMatrix;

31
src/qrcode/detector.rs
View File

@@ -1,30 +1,7 @@
import com.google.zxing.ResultPoint; use crate::{ResultPoint,NotFoundException,ResultPointCallback,DecodeHintType,FormatException};
use crate::common::{BitMatrix,DetectorResult,GridSampler,PerspectiveTransform};
import com.google.zxing.NotFoundException; use crate::common::detector::{MathUtils};
import com.google.zxing.ResultPointCallback; use crate::qrcode::decoder::Version;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.DecodeHintType;
import com.google.zxing.FormatException;
import com.google.zxing.NotFoundException;
import com.google.zxing.ResultPoint;
import com.google.zxing.ResultPointCallback;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.common.DetectorResult;
import com.google.zxing.common.GridSampler;
import com.google.zxing.common.PerspectiveTransform;
import com.google.zxing.common.detector.MathUtils;
import com.google.zxing.qrcode.decoder.Version;
import com.google.zxing.ResultPoint;
import com.google.zxing.DecodeHintType;
import com.google.zxing.NotFoundException;
import com.google.zxing.ResultPoint;
import com.google.zxing.ResultPointCallback;
import com.google.zxing.common.BitMatrix;
// NEW FILE: alignment_pattern.rs // NEW FILE: alignment_pattern.rs

31
src/qrcode/encoder.rs
View File

@@ -1,30 +1,7 @@
import com.google.zxing.EncodeHintType; use crate::{EncodeHintType,WriterException,};
import com.google.zxing.WriterException; use crate::common::{BitArray,StringUtils,CharacterSetECI,ECIEncoderSet,};
import com.google.zxing.common.BitArray; use crate::common::reedsolmon::{GenericGF,ReedSolomonEncoder,};
import com.google.zxing.common.StringUtils; use crate::qrcode::decoder::{ErrorCorrectionLevel,Mode,Version,};
import com.google.zxing.common.CharacterSetECI;
import com.google.zxing.common.reedsolomon.GenericGF;
import com.google.zxing.common.reedsolomon.ReedSolomonEncoder;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import com.google.zxing.qrcode.decoder.Mode;
import com.google.zxing.qrcode.decoder.Version;
import com.google.zxing.WriterException;
import com.google.zxing.common.BitArray;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import com.google.zxing.qrcode.decoder.Version;
import com.google.zxing.qrcode.decoder.Mode;
import com.google.zxing.qrcode.decoder.Version;
import com.google.zxing.common.BitArray;
import com.google.zxing.common.ECIEncoderSet;
import com.google.zxing.WriterException;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import com.google.zxing.qrcode.decoder.Mode;
import com.google.zxing.qrcode.decoder.Version;
// NEW FILE: block_pair.rs // NEW FILE: block_pair.rs
/* /*