diff --git a/src/aztec/aztec_reader.rs b/src/aztec/aztec_reader.rs index d03f0cb..ac9417e 100644 --- a/src/aztec/aztec_reader.rs +++ b/src/aztec/aztec_reader.rs @@ -92,7 +92,7 @@ impl Reader for AztecReader { { // if let DecodeHintValue::NeedResultPointCallback(cb) = rpcb { for point in points { - cb(point); + cb(*point); } // } } diff --git a/src/lib.rs b/src/lib.rs index b83ada3..dd88971 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -36,7 +36,7 @@ pub use encode_hints::*; /// Callback which is invoked when a possible result point (significant /// point in the barcode image such as a corner) is found. -pub type PointCallback = Rc; +pub type PointCallback = Rc; /** Temporary type to ease refactoring and keep backwards-compatibility */ pub type RXingResultPointCallback = PointCallback; diff --git a/src/oned/rss/rss_14_reader.rs b/src/oned/rss/rss_14_reader.rs index 0f23616..3dd0b03 100644 --- a/src/oned/rss/rss_14_reader.rs +++ b/src/oned/rss/rss_14_reader.rs @@ -259,7 +259,7 @@ impl RSS14Reader { // row is actually reversed center = row.getSize() as f32 - 1.0 - center; } - cb(&point(center, rowNumber as f32)); + cb(point(center, rowNumber as f32)); } let outside = self.decodeDataCharacter(row, &pattern, true)?; diff --git a/src/oned/upc_ean_reader.rs b/src/oned/upc_ean_reader.rs index 346c90f..0adb5e8 100644 --- a/src/oned/upc_ean_reader.rs +++ b/src/oned/upc_ean_reader.rs @@ -156,7 +156,7 @@ pub trait UPCEANReader: OneDReader { let mut symbologyIdentifier = 0; if let Some(DecodeHintValue::NeedResultPointCallback(cb)) = resultPointCallback { - cb(&point( + cb(point( (startGuardRange[0] + startGuardRange[1]) as f32 / 2.0, rowNumber as f32, )); @@ -166,13 +166,13 @@ pub trait UPCEANReader: OneDReader { let endStart = self.decodeMiddle(row, startGuardRange, &mut result)?; if let Some(DecodeHintValue::NeedResultPointCallback(cb)) = resultPointCallback { - cb(&point(endStart as f32, rowNumber as f32)); + cb(point(endStart as f32, rowNumber as f32)); } let endRange = self.decodeEnd(row, endStart)?; if let Some(DecodeHintValue::NeedResultPointCallback(cb)) = resultPointCallback { - cb(&point( + cb(point( (endRange[0] + endRange[1]) as f32 / 2.0, rowNumber as f32, )); diff --git a/src/qrcode/detector/alignment_pattern_finder.rs b/src/qrcode/detector/alignment_pattern_finder.rs index 8982dc3..6fb2505 100644 --- a/src/qrcode/detector/alignment_pattern_finder.rs +++ b/src/qrcode/detector/alignment_pattern_finder.rs @@ -311,7 +311,7 @@ impl AlignmentPatternFinder { // Hadn't found this before; save it let point = AlignmentPattern::new(centerJ, centerI, estimatedModuleSize); if let Some(rpc) = self.resultPointCallback.clone() { - rpc(&point); + rpc((&point).into()); } self.possibleCenters.push(point); diff --git a/src/qrcode/detector/finder_pattern_finder.rs b/src/qrcode/detector/finder_pattern_finder.rs index 1f1801d..0b40745 100755 --- a/src/qrcode/detector/finder_pattern_finder.rs +++ b/src/qrcode/detector/finder_pattern_finder.rs @@ -603,7 +603,7 @@ impl<'a> FinderPatternFinder<'_> { let point = FinderPattern::new(centerJ, centerI, estimatedModuleSize); self.possibleCenters.push(point); if let Some(rpc) = self.resultPointCallback.clone() { - rpc(&point); + rpc((&point).into()); } } return true;