swap point_f and point functions

This commit is contained in:
Henry Schimke
2023-05-04 14:50:32 -05:00
parent 80f06ecb3c
commit 3fc068f49b
38 changed files with 210 additions and 217 deletions

View File

@@ -17,7 +17,7 @@
use std::collections::HashMap;
use crate::common::Result;
use crate::{point, Binarizer, Exceptions, Point, RXingResult, Reader};
use crate::{point_f, Binarizer, Exceptions, Point, RXingResult, Reader};
/**
* This class attempts to decode a barcode from an image, not by scanning the whole image,
@@ -133,7 +133,7 @@ impl<T: Reader> ByQuadrantReader<T> {
// result
points
.iter()
.map(|relative| point(relative.x + leftOffset, relative.y + topOffset))
.map(|relative| point_f(relative.x + leftOffset, relative.y + topOffset))
.collect()
}
}

View File

@@ -17,7 +17,7 @@
use std::collections::HashMap;
use crate::{
common::Result, point, Binarizer, BinaryBitmap, DecodingHintDictionary, Exceptions, Point,
common::Result, point_f, Binarizer, BinaryBitmap, DecodingHintDictionary, Exceptions, Point,
RXingResult, Reader,
};
@@ -185,7 +185,7 @@ impl<T: Reader> GenericMultipleBarcodeReader<T> {
let newPoints: Vec<Point> = oldPoints
.iter()
.map(|oldPoint| point(oldPoint.x + xOffset as f32, oldPoint.y + yOffset as f32))
.map(|oldPoint| point_f(oldPoint.x + xOffset as f32, oldPoint.y + yOffset as f32))
.collect();
// let mut newPoints = Vec::with_capacity(oldPoints.len());