mirror of
https://github.com/starovoid/rxing.git
synced 2026-07-26 04:12:34 +00:00
partial move to use::crate
This commit is contained in:
Henry Schimke
@@ -8,7 +8,7 @@ use crate::{BarcodeFormat,BinaryBitmap,DecodeHintType,FormatException,NotFoundEx
|
||||
use crate::aztec::decoder::Decoder;
|
||||
use crate::aztec::detector::Detector;
|
||||
|
||||
use crate::aztec::encoder{AztecCode,Encoder};
|
||||
use crate::aztec::encoder::{AztecCode,Encoder};
|
||||
|
||||
|
||||
// AztecDetectorResult.java
|
||||
|
||||
@@ -1,11 +1,7 @@
|
||||
import com.google.zxing.FormatException;
|
||||
import com.google.zxing.aztec.AztecDetectorResult;
|
||||
import com.google.zxing.common.BitMatrix;
|
||||
import com.google.zxing.common.CharacterSetECI;
|
||||
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;
|
||||
use create::FormatException;
|
||||
use crate::aztec::AztecDetectorResult;
|
||||
use crate::common::{BitMatrix,CharacterSetECI,DecoderResult};
|
||||
use crate::common::reedsolomon::{GenericGF,ReedSolomonDecoder,ReedSolomonException};
|
||||
|
||||
/**
|
||||
* <p>The main class which implements Aztec Code decoding -- as opposed to locating and extracting
|
||||
|
||||
@@ -1,13 +1,8 @@
|
||||
import com.google.zxing.NotFoundException;
|
||||
import com.google.zxing.ResultPoint;
|
||||
import com.google.zxing.aztec.AztecDetectorResult;
|
||||
import com.google.zxing.common.BitMatrix;
|
||||
import com.google.zxing.common.GridSampler;
|
||||
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;
|
||||
use crate::{NotFoundException,ResultPoint};
|
||||
use crate::aztec::AztecDetectorResult;
|
||||
use crate::common::{BitMatrix,GridSampler};
|
||||
use crate::common::detector::{MathUtils,WhiteRectangleDetector};
|
||||
use crate::common::reedsolomon::{GenericGF,ReedSolomonDecoder,ReedSolomonException};
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use crate::common::{BitArray,BitMatrix,CharacterSetECI};
|
||||
use crate::common::reedsolomon{GenericGF,ReedSolomonEncoder};
|
||||
use crate::common::reedsolomon::{GenericGF,ReedSolomonEncoder};
|
||||
|
||||
// Token.java
|
||||
const EMPTY: Token = SimpleToken::new(null, 0, 0);
|
||||
|
||||
@@ -1,31 +1,10 @@
|
||||
import com.google.zxing.BarcodeFormat;
|
||||
import com.google.zxing.BinaryBitmap;
|
||||
import com.google.zxing.ChecksumException;
|
||||
import com.google.zxing.DecodeHintType;
|
||||
import com.google.zxing.FormatException;
|
||||
import com.google.zxing.NotFoundException;
|
||||
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;
|
||||
use crate::{BarcodeFormat,BinaryBitmap,DecodeHintType,ChecksumException,FormatException,NotFoundException,Reader,RXingResult,ResultMetadataType,ResultPoint,EncodeHintType,Writer,Dimension};
|
||||
use crate::common::{DecoderResult,BitMatrix,DetectorResult,};
|
||||
use crate::datamatrix::decoder::{Decoder};
|
||||
use crate::datamatrix::detector::{Detector};
|
||||
use crate::datamatrix::encoder::{DefaultPlacement,ErrorCorrection,HighLevelEncoder,MinimalEncoder,SymbolInfo,SymbolShapeHint};
|
||||
use crate::qrcode::encoder::ByteMatrix;
|
||||
|
||||
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
|
||||
/**
|
||||
|
||||
@@ -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
|
||||
/**
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
import com.google.zxing.NotFoundException;
|
||||
import com.google.zxing.ResultPoint;
|
||||
import com.google.zxing.common.BitMatrix;
|
||||
import com.google.zxing.common.DetectorResult;
|
||||
import com.google.zxing.common.GridSampler;
|
||||
import com.google.zxing.common.detector.WhiteRectangleDetector;
|
||||
use crate::{NotFoundException,ResultPoint};
|
||||
use crate::common::{BitMatrix,DetectorResult,GridSampler};
|
||||
use crate::common::detector::WhiteRectangleDetector;
|
||||
|
||||
// Detector.java
|
||||
/**
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import com.google.zxing.Dimension;
|
||||
import com.google.zxing.common.MinimalECIInput;
|
||||
use crate::Dimension;
|
||||
use crate::common::MinimalECIInput;
|
||||
|
||||
// ASCIIEncoder.java
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
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::qrcode::detector::MultiDetector;
|
||||
use create::qrcode::{QRCodeReader};
|
||||
|
||||
@@ -1,18 +1,7 @@
|
||||
import com.google.zxing.NotFoundException;
|
||||
import com.google.zxing.common.detector.MathUtils;
|
||||
import com.google.zxing.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;
|
||||
use crate::{NotFoundException,ResultPoint,BarcodeFormat,DecodeHintType,NotFoundException,RXingResult,ResultMetadataType,ResultPoint,ResultPointCallback};
|
||||
use crate::common::BitArray;
|
||||
use crate::common::detector::{MathUtils};
|
||||
use crate::oned::{OneDReader};
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
/*
|
||||
|
||||
@@ -1,15 +1,5 @@
|
||||
import com.google.zxing.FormatException;
|
||||
import com.google.zxing.NotFoundException;
|
||||
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;
|
||||
use crate::{FormatException,NotFoundException};
|
||||
use crate::common::BitArray;
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
/*
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
import com.google.zxing.ChecksumException;
|
||||
|
||||
import com.google.zxing.pdf417.PDF417Common;
|
||||
|
||||
use crate::ChecksumException;
|
||||
use crate::pdf417::PDF417Common;
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,13 +1,5 @@
|
||||
|
||||
import com.google.zxing.BinaryBitmap;
|
||||
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;
|
||||
use crate::{BinaryBitmap,NotFoundException,DecodeHintType,ResultPoint};
|
||||
use crate::common::BitMatrix;
|
||||
|
||||
// NEW FILE: detector.rs
|
||||
/*
|
||||
|
||||
@@ -1,10 +1,5 @@
|
||||
import com.google.zxing.WriterException;
|
||||
|
||||
import com.google.zxing.WriterException;
|
||||
import com.google.zxing.common.CharacterSetECI;
|
||||
import com.google.zxing.common.ECIInput;
|
||||
import com.google.zxing.common.MinimalECIInput;
|
||||
|
||||
use crate::{WriterException,};
|
||||
use crate::common::{CharacterSetECI,ECIInput,MinimalECIInput};
|
||||
|
||||
|
||||
// NEW FILE: barcode_matrix.rs
|
||||
|
||||
@@ -1,34 +1,6 @@
|
||||
import com.google.zxing.FormatException;
|
||||
import com.google.zxing.common.BitMatrix;
|
||||
|
||||
|
||||
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;
|
||||
use crate::{FormatException,DecodeHintType,ChecksumException,ResultPoint};
|
||||
use crate::comon::{BitMatrix,BitSource,CharacterSetECI,DecoderResult,StringUtils};
|
||||
use crate::common::reedsolomon::{GenericGF,ReedSolomonDecoder,ReedSolomonException};
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,30 +1,7 @@
|
||||
import com.google.zxing.ResultPoint;
|
||||
|
||||
import com.google.zxing.NotFoundException;
|
||||
import com.google.zxing.ResultPointCallback;
|
||||
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;
|
||||
|
||||
use crate::{ResultPoint,NotFoundException,ResultPointCallback,DecodeHintType,FormatException};
|
||||
use crate::common::{BitMatrix,DetectorResult,GridSampler,PerspectiveTransform};
|
||||
use crate::common::detector::{MathUtils};
|
||||
use crate::qrcode::decoder::Version;
|
||||
|
||||
|
||||
// NEW FILE: alignment_pattern.rs
|
||||
|
||||
@@ -1,30 +1,7 @@
|
||||
import com.google.zxing.EncodeHintType;
|
||||
import com.google.zxing.WriterException;
|
||||
import com.google.zxing.common.BitArray;
|
||||
import com.google.zxing.common.StringUtils;
|
||||
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;
|
||||
|
||||
use crate::{EncodeHintType,WriterException,};
|
||||
use crate::common::{BitArray,StringUtils,CharacterSetECI,ECIEncoderSet,};
|
||||
use crate::common::reedsolmon::{GenericGF,ReedSolomonEncoder,};
|
||||
use crate::qrcode::decoder::{ErrorCorrectionLevel,Mode,Version,};
|
||||
|
||||
// NEW FILE: block_pair.rs
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user