mirror of
https://github.com/starovoid/rxing.git
synced 2026-07-28 05:12:34 +00:00
convert most variable swaps to mem swaps
This commit is contained in:
@@ -85,9 +85,7 @@ impl Detector {
|
|||||||
let mut bulls_eye_corners = self.get_bulls_eye_corners(p_center)?;
|
let mut bulls_eye_corners = self.get_bulls_eye_corners(p_center)?;
|
||||||
|
|
||||||
if is_mirror {
|
if is_mirror {
|
||||||
let temp = bulls_eye_corners[0];
|
bulls_eye_corners.swap(0,2);
|
||||||
bulls_eye_corners[0] = bulls_eye_corners[2];
|
|
||||||
bulls_eye_corners[2] = temp;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. Get the size of the matrix and other parameters from the bull's eye
|
// 3. Get the size of the matrix and other parameters from the bull's eye
|
||||||
|
|||||||
@@ -214,9 +214,8 @@ impl GlobalHistogramBinarizer {
|
|||||||
|
|
||||||
// Make sure firstPeak corresponds to the black peak.
|
// Make sure firstPeak corresponds to the black peak.
|
||||||
if firstPeak > secondPeak {
|
if firstPeak > secondPeak {
|
||||||
let temp = firstPeak;
|
|
||||||
firstPeak = secondPeak;
|
std::mem::swap(&mut firstPeak, &mut secondPeak);
|
||||||
secondPeak = temp;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// If there is too little contrast in the image to pick a meaningful black point, throw rather
|
// If there is too little contrast in the image to pick a meaningful black point, throw rather
|
||||||
|
|||||||
@@ -154,9 +154,7 @@ impl GenericGFPoly {
|
|||||||
let mut smallerCoefficients = self.coefficients.clone();
|
let mut smallerCoefficients = self.coefficients.clone();
|
||||||
let mut largerCoefficients = other.coefficients.clone();
|
let mut largerCoefficients = other.coefficients.clone();
|
||||||
if smallerCoefficients.len() > largerCoefficients.len() {
|
if smallerCoefficients.len() > largerCoefficients.len() {
|
||||||
let temp = smallerCoefficients;
|
std::mem::swap(&mut smallerCoefficients,&mut largerCoefficients)
|
||||||
smallerCoefficients = largerCoefficients;
|
|
||||||
largerCoefficients = temp;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut sumDiff = vec![0; largerCoefficients.len()];
|
let mut sumDiff = vec![0; largerCoefficients.len()];
|
||||||
|
|||||||
@@ -121,9 +121,7 @@ impl ReedSolomonDecoder {
|
|||||||
let mut a = a.clone();
|
let mut a = a.clone();
|
||||||
let mut b = b.clone();
|
let mut b = b.clone();
|
||||||
if a.getDegree() < b.getDegree() {
|
if a.getDegree() < b.getDegree() {
|
||||||
let temp = a;
|
std::mem::swap(&mut a, &mut b);
|
||||||
a = b;
|
|
||||||
b = temp;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut rLast = a;
|
let mut rLast = a;
|
||||||
|
|||||||
@@ -840,9 +840,8 @@ impl RSSExpandedReader {
|
|||||||
let mut j = counters.len() - 1;
|
let mut j = counters.len() - 1;
|
||||||
while i < j {
|
while i < j {
|
||||||
// for (int i = 0, j = counters.length - 1; i < j; i++, j--) {
|
// for (int i = 0, j = counters.length - 1; i < j; i++, j--) {
|
||||||
let temp = counters[i];
|
|
||||||
counters[i] = counters[j];
|
counters.swap(i, j);
|
||||||
counters[j] = temp;
|
|
||||||
|
|
||||||
i += 1;
|
i += 1;
|
||||||
j -= 1;
|
j -= 1;
|
||||||
|
|||||||
@@ -307,9 +307,8 @@ impl RSS14Reader {
|
|||||||
let mut j = counters.len() - 1;
|
let mut j = counters.len() - 1;
|
||||||
while i < j {
|
while i < j {
|
||||||
// for (int i = 0, j = counters.length - 1; i < j; i++, j--) {
|
// for (int i = 0, j = counters.length - 1; i < j; i++, j--) {
|
||||||
let temp = counters[i];
|
|
||||||
counters[i] = counters[j];
|
counters.swap(i,j);
|
||||||
counters[j] = temp;
|
|
||||||
|
|
||||||
i += 1;
|
i += 1;
|
||||||
j -= 1;
|
j -= 1;
|
||||||
|
|||||||
@@ -124,9 +124,7 @@ fn runEuclideanAlgorithm(
|
|||||||
let mut a = a;
|
let mut a = a;
|
||||||
let mut b = b;
|
let mut b = b;
|
||||||
if a.getDegree() < b.getDegree() {
|
if a.getDegree() < b.getDegree() {
|
||||||
let temp = a;
|
std::mem::swap(&mut a,&mut b);
|
||||||
a = b;
|
|
||||||
b = temp;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut rLast = a;
|
let mut rLast = a;
|
||||||
|
|||||||
@@ -139,9 +139,7 @@ impl ModulusPoly {
|
|||||||
let mut smallerCoefficients = &self.coefficients;
|
let mut smallerCoefficients = &self.coefficients;
|
||||||
let mut largerCoefficients = &other.coefficients;
|
let mut largerCoefficients = &other.coefficients;
|
||||||
if smallerCoefficients.len() > largerCoefficients.len() {
|
if smallerCoefficients.len() > largerCoefficients.len() {
|
||||||
let temp = smallerCoefficients;
|
std::mem::swap(&mut smallerCoefficients, &mut largerCoefficients);
|
||||||
smallerCoefficients = largerCoefficients;
|
|
||||||
largerCoefficients = temp;
|
|
||||||
}
|
}
|
||||||
let mut sumDiff = vec![0032; largerCoefficients.len()];
|
let mut sumDiff = vec![0032; largerCoefficients.len()];
|
||||||
let lengthDiff = largerCoefficients.len() - smallerCoefficients.len();
|
let lengthDiff = largerCoefficients.len() - smallerCoefficients.len();
|
||||||
|
|||||||
@@ -230,9 +230,7 @@ impl PlanarYUVLuminanceSource {
|
|||||||
let mut x2 = rowStart + width - 1;
|
let mut x2 = rowStart + width - 1;
|
||||||
for x1 in rowStart..middle {
|
for x1 in rowStart..middle {
|
||||||
//for (int x1 = rowStart, x2 = rowStart + width - 1; x1 < middle; x1++, x2--) {
|
//for (int x1 = rowStart, x2 = rowStart + width - 1; x1 < middle; x1++, x2--) {
|
||||||
let temp = self.yuv_data[x1];
|
self.yuv_data.swap(x1, x2);
|
||||||
self.yuv_data[x1] = self.yuv_data[x2];
|
|
||||||
self.yuv_data[x2] = temp;
|
|
||||||
x2 -= 1;
|
x2 -= 1;
|
||||||
}
|
}
|
||||||
rowStart += self.data_width;
|
rowStart += self.data_width;
|
||||||
|
|||||||
@@ -767,9 +767,7 @@ impl FinderPatternFinder {
|
|||||||
if a < b {
|
if a < b {
|
||||||
if b > c {
|
if b > c {
|
||||||
if a < c {
|
if a < c {
|
||||||
let temp = b;
|
std::mem::swap(&mut b, &mut c)
|
||||||
b = c;
|
|
||||||
c = temp;
|
|
||||||
} else {
|
} else {
|
||||||
let temp = a;
|
let temp = a;
|
||||||
a = c;
|
a = c;
|
||||||
@@ -780,9 +778,7 @@ impl FinderPatternFinder {
|
|||||||
} else {
|
} else {
|
||||||
if b < c {
|
if b < c {
|
||||||
if a < c {
|
if a < c {
|
||||||
let temp = a;
|
std::mem::swap(&mut a, &mut b)
|
||||||
a = b;
|
|
||||||
b = temp;
|
|
||||||
} else {
|
} else {
|
||||||
let temp = a;
|
let temp = a;
|
||||||
a = b;
|
a = b;
|
||||||
@@ -790,9 +786,7 @@ impl FinderPatternFinder {
|
|||||||
c = temp;
|
c = temp;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
let temp = a;
|
std::mem::swap(&mut a, &mut c);
|
||||||
a = c;
|
|
||||||
c = temp;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -50,9 +50,7 @@ pub fn orderBestPatterns<T: ResultPoint + Copy + Clone>(patterns: &mut [T; 3]) {
|
|||||||
// we want for A, B, C. If it's negative, then we've got it flipped around and
|
// we want for A, B, C. If it's negative, then we've got it flipped around and
|
||||||
// should swap A and C.
|
// should swap A and C.
|
||||||
if crossProductZ(pointA, pointB, pointC) < 0.0f32 {
|
if crossProductZ(pointA, pointB, pointC) < 0.0f32 {
|
||||||
let temp = pointA;
|
std::mem::swap(&mut pointA, &mut pointC);
|
||||||
pointA = pointC;
|
|
||||||
pointC = temp;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let pa = pointA;
|
let pa = pointA;
|
||||||
|
|||||||
Reference in New Issue
Block a user