diff --git a/src/multi/ByQuadrantReader.java b/src/multi/ByQuadrantReader.java deleted file mode 100644 index 8013df6..0000000 --- a/src/multi/ByQuadrantReader.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright 2009 ZXing authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.zxing.multi; - -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.RXingResult; -import com.google.zxing.RXingResultPoint; - -import java.util.Map; - -/** - * This class attempts to decode a barcode from an image, not by scanning the whole image, - * but by scanning subsets of the image. This is important when there may be multiple barcodes in - * an image, and detecting a barcode may find parts of multiple barcode and fail to decode - * (e.g. QR Codes). Instead this scans the four quadrants of the image -- and also the center - * 'quadrant' to cover the case where a barcode is found in the center. - * - * @see GenericMultipleBarcodeReader - */ -public final class ByQuadrantReader implements Reader { - - private final Reader delegate; - - public ByQuadrantReader(Reader delegate) { - this.delegate = delegate; - } - - @Override - public RXingResult decode(BinaryBitmap image) - throws NotFoundException, ChecksumException, FormatException { - return decode(image, null); - } - - @Override - public RXingResult decode(BinaryBitmap image, Map hints) - throws NotFoundException, ChecksumException, FormatException { - - int width = image.getWidth(); - int height = image.getHeight(); - int halfWidth = width / 2; - int halfHeight = height / 2; - - try { - // No need to call makeAbsolute as results will be relative to original top left here - return delegate.decode(image.crop(0, 0, halfWidth, halfHeight), hints); - } catch (NotFoundException re) { - // continue - } - - try { - RXingResult result = delegate.decode(image.crop(halfWidth, 0, halfWidth, halfHeight), hints); - makeAbsolute(result.getRXingResultPoints(), halfWidth, 0); - return result; - } catch (NotFoundException re) { - // continue - } - - try { - RXingResult result = delegate.decode(image.crop(0, halfHeight, halfWidth, halfHeight), hints); - makeAbsolute(result.getRXingResultPoints(), 0, halfHeight); - return result; - } catch (NotFoundException re) { - // continue - } - - try { - RXingResult result = delegate.decode(image.crop(halfWidth, halfHeight, halfWidth, halfHeight), hints); - makeAbsolute(result.getRXingResultPoints(), halfWidth, halfHeight); - return result; - } catch (NotFoundException re) { - // continue - } - - int quarterWidth = halfWidth / 2; - int quarterHeight = halfHeight / 2; - BinaryBitmap center = image.crop(quarterWidth, quarterHeight, halfWidth, halfHeight); - RXingResult result = delegate.decode(center, hints); - makeAbsolute(result.getRXingResultPoints(), quarterWidth, quarterHeight); - return result; - } - - @Override - public void reset() { - delegate.reset(); - } - - private static void makeAbsolute(RXingResultPoint[] points, int leftOffset, int topOffset) { - if (points != null) { - for (int i = 0; i < points.length; i++) { - RXingResultPoint relative = points[i]; - if (relative != null) { - points[i] = new RXingResultPoint(relative.getX() + leftOffset, relative.getY() + topOffset); - } - } - } - } - -} diff --git a/src/multi/by_quadrant_reader.rs b/src/multi/by_quadrant_reader.rs new file mode 100644 index 0000000..36ad36d --- /dev/null +++ b/src/multi/by_quadrant_reader.rs @@ -0,0 +1,168 @@ +/* + * Copyright 2009 ZXing authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +use std::collections::HashMap; + +use crate::{Exceptions, RXingResult, RXingResultPoint, Reader, ResultPoint}; + +/** + * This class attempts to decode a barcode from an image, not by scanning the whole image, + * but by scanning subsets of the image. This is important when there may be multiple barcodes in + * an image, and detecting a barcode may find parts of multiple barcode and fail to decode + * (e.g. QR Codes). Instead this scans the four quadrants of the image -- and also the center + * 'quadrant' to cover the case where a barcode is found in the center. + * + * @see GenericMultipleBarcodeReader + */ +pub struct ByQuadrantReader(T); +impl Reader for ByQuadrantReader { + fn decode( + &mut self, + image: &crate::BinaryBitmap, + ) -> Result { + self.decode_with_hints(image, &HashMap::new()) + } + + fn decode_with_hints( + &mut self, + image: &crate::BinaryBitmap, + hints: &crate::DecodingHintDictionary, + ) -> Result { + let width = image.getWidth(); + let height = image.getHeight(); + let halfWidth = width / 2; + let halfHeight = height / 2; + + // try { + let attempt = self + .0 + .decode_with_hints(&image.crop(0, 0, halfWidth, halfHeight), hints); + // No need to call makeAbsolute as results will be relative to original top left here + match attempt { + // Ok() => return attempt, + Err(Exceptions::NotFoundException(_)) => {} + _ => return attempt, + } + // } catch (NotFoundException re) { + // continue + // } + + // try { + let result = self + .0 + .decode_with_hints(&image.crop(halfWidth, 0, halfWidth, halfHeight), hints); + match result { + Ok(res) => { + let points = Self::makeAbsolute(res.getRXingResultPoints(), halfWidth as f32, 0.0); + return Ok(RXingResult::new_from_existing_result(res, points)); + } + Err(Exceptions::NotFoundException(_)) => {} + _ => return result, + } + // makeAbsolute(result.getRXingResultPoints(), halfWidth, 0); + // return result; + // } catch (NotFoundException re) { + // continue + // } + + let result = self + .0 + .decode_with_hints(&image.crop(0, halfHeight, halfWidth, halfHeight), hints); + match result { + Ok(res) => { + let points = Self::makeAbsolute(res.getRXingResultPoints(), 0.0, halfHeight as f32); + return Ok(RXingResult::new_from_existing_result(res, points)); + } + Err(Exceptions::NotFoundException(_)) => {} + _ => return result, + } + // try { + // RXingResult result = delegate.decode(image.crop(0, halfHeight, halfWidth, halfHeight), hints); + // makeAbsolute(result.getRXingResultPoints(), 0, halfHeight); + // return result; + // } catch (NotFoundException re) { + // // continue + // } + + let result = self.0.decode_with_hints( + &image.crop(halfWidth, halfHeight, halfWidth, halfHeight), + hints, + ); + match result { + Ok(res) => { + let points = Self::makeAbsolute( + res.getRXingResultPoints(), + halfWidth as f32, + halfHeight as f32, + ); + return Ok(RXingResult::new_from_existing_result(res, points)); + } + Err(Exceptions::NotFoundException(_)) => {} + _ => return result, + } + + // try { + // RXingResult result = delegate.decode(image.crop(halfWidth, halfHeight, halfWidth, halfHeight), hints); + // makeAbsolute(result.getRXingResultPoints(), halfWidth, halfHeight); + // return result; + // } catch (NotFoundException re) { + // // continue + // } + + let quarterWidth = halfWidth / 2; + let quarterHeight = halfHeight / 2; + let center = image.crop(quarterWidth, quarterHeight, halfWidth, halfHeight); + let result = self.0.decode_with_hints(¢er, hints)?; + + let points = Self::makeAbsolute( + result.getRXingResultPoints(), + quarterWidth as f32, + quarterHeight as f32, + ); + Ok(RXingResult::new_from_existing_result(result, points)) + } + + fn reset(&mut self) { + self.0.reset() + } +} + +impl ByQuadrantReader { + pub fn new(delegate: T) -> Self { + Self(delegate) + } + + fn makeAbsolute( + points: &[RXingResultPoint], + leftOffset: f32, + topOffset: f32, + ) -> Vec { + let mut result = Vec::new(); + if !points.is_empty() { + for relative in points { + // for (int i = 0; i < points.length; i++) { + // let relative = points[i]; + // if relative != null { + result.push(RXingResultPoint::new( + relative.getX() + leftOffset, + relative.getY() + topOffset, + )); + // } + } + } + result + } +} diff --git a/src/multi/mod.rs b/src/multi/mod.rs index a55c715..ad05da4 100644 --- a/src/multi/mod.rs +++ b/src/multi/mod.rs @@ -1,3 +1,6 @@ mod multiple_barcode_reader; pub mod qrcode; pub use multiple_barcode_reader::*; + +mod by_quadrant_reader; +pub use by_quadrant_reader::*; diff --git a/src/rxing_result.rs b/src/rxing_result.rs index f611397..3f27b7e 100644 --- a/src/rxing_result.rs +++ b/src/rxing_result.rs @@ -91,6 +91,18 @@ impl RXingResult { } } + pub fn new_from_existing_result(prev: Self, points: Vec) -> Self { + Self { + text: prev.text, + rawBytes: prev.rawBytes, + numBits: prev.numBits, + resultPoints: points, + format: prev.format, + resultMetadata: prev.resultMetadata, + timestamp: prev.timestamp, + } + } + /** * @return raw text encoded by the barcode */