diff --git a/src/lib.rs b/src/lib.rs index c9973e4..7df1f96 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,3 +1,6 @@ +#![allow(non_snake_case)] +#![allow(non_camel_case_types)] + pub mod aztec; pub mod client; pub mod common; @@ -1171,7 +1174,6 @@ impl fmt::Display for RXingResult { */ //package com.google.zxing; -use crate::common::detector::MathUtils; pub trait ResultPoint { fn getX(&self) -> f32; @@ -2000,7 +2002,7 @@ impl PlanarYUVLuminanceSource { fn reverseHorizontal(&mut self, width: usize, height: usize) { //let mut yuvData = self.yuvData; let mut rowStart = self.top * self.data_width + self.left; - for y in 0..height { + for _y in 0..height { let middle = rowStart + width / 2; let mut x2 = rowStart + width - 1; for x1 in rowStart..middle { @@ -2124,7 +2126,7 @@ impl LuminanceSource for PlanarYUVLuminanceSource { self.invert, ) { Ok(new) => Ok(Box::new(new)), - Err(err) => Err(Exceptions::UnsupportedOperationException("".to_owned())), + Err(_err) => Err(Exceptions::UnsupportedOperationException("".to_owned())), } } @@ -2270,7 +2272,7 @@ impl LuminanceSource for RGBLuminanceSource { height, ) { Ok(crop) => Ok(Box::new(crop)), - Err(error) => Err(Exceptions::UnsupportedOperationException("".to_owned())), + Err(_error) => Err(Exceptions::UnsupportedOperationException("".to_owned())), } } diff --git a/src/qrcode/detector/alignment_pattern_finder.rs b/src/qrcode/detector/alignment_pattern_finder.rs index 45e9985..bdc9735 100644 --- a/src/qrcode/detector/alignment_pattern_finder.rs +++ b/src/qrcode/detector/alignment_pattern_finder.rs @@ -140,7 +140,7 @@ impl AlignmentPatternFinder { } } else { // White pixel - if (currentState == 1) { + if currentState == 1 { // Counting black pixels currentState += 1; } @@ -148,9 +148,9 @@ impl AlignmentPatternFinder { } j += 1; } - if (self.foundPatternCross(&stateCount)) { + if self.foundPatternCross(&stateCount) { let confirmed = self.handlePossibleCenter(&stateCount, i, maxJ); - if (confirmed.is_some()) { + if confirmed.is_some() { return Ok(confirmed.unwrap()); } } @@ -158,7 +158,7 @@ impl AlignmentPatternFinder { // Hmm, nothing we saw was observed and confirmed twice. If we had // any guess at all, return it. - if (!self.possibleCenters.is_empty()) { + if !self.possibleCenters.is_empty() { return Ok(self.possibleCenters.get(0).unwrap().clone()); } diff --git a/src/qrcode/detector/detector.rs b/src/qrcode/detector/detector.rs index 71b6d87..d262973 100644 --- a/src/qrcode/detector/detector.rs +++ b/src/qrcode/detector/detector.rs @@ -198,7 +198,7 @@ impl Detector { let bottomRightY: f32; let sourceBottomRightX: f32; let sourceBottomRightY: f32; - if (alignmentPattern.is_some()) { + if alignmentPattern.is_some() { let alignmentPattern = alignmentPattern.as_ref().unwrap(); bottomRightX = alignmentPattern.getX(); bottomRightY = alignmentPattern.getY(); @@ -337,24 +337,24 @@ impl Detector { // Now count other way -- don't run off image though of course let mut scale = 1.0; let mut otherToX = fromX as i32 - (toX as i32 - fromX as i32); - if (otherToX < 0) { + if otherToX < 0 { scale = fromX as f32 / (fromX as i32- otherToX) as f32; otherToX = 0; - } else if (otherToX as u32 >= self.image.getWidth() ) { + } else if otherToX as u32 >= self.image.getWidth() { scale = (self.image.getWidth() as i32 - 1 - fromX as i32) as f32 / (otherToX - fromX as i32) as f32; otherToX = self.image.getWidth() as i32 - 1; } - let mut otherToY = (fromY as i32 - (toY as i32 - fromY as i32) * scale as i32); + let mut otherToY = fromY as i32 - (toY as i32 - fromY as i32) * scale as i32; scale = 1.0; - if (otherToY < 0) { + if otherToY < 0 { scale = fromY as f32 / (fromY as i32 - otherToY) as f32; otherToY = 0; - } else if (otherToY as u32 >= self.image.getHeight()) { + } else if otherToY as u32 >= self.image.getHeight() { scale = (self.image.getHeight() as i32 - 1 - fromY as i32) as f32 / (otherToY - fromY as i32) as f32; otherToY = self.image.getHeight() as i32 - 1; } - otherToX = (fromX as i32+ (otherToX - fromX as i32) * scale as i32); + otherToX = fromX as i32+ (otherToX - fromX as i32) * scale as i32; result += self.sizeOfBlackWhiteBlackRun(fromX as u32, fromY as u32, otherToX as u32, otherToY as u32); @@ -378,7 +378,7 @@ impl Detector { // Mild variant of Bresenham's algorithm; // see http://en.wikipedia.org/wiki/Bresenham's_line_algorithm let steep = (toY as i64 - fromY as i64).abs() > (toX as i64 - fromX as i64).abs(); - if (steep) { + if steep { let mut temp = fromX; fromX = fromY; fromY = temp; @@ -408,16 +408,16 @@ impl Detector { // Does current pixel mean we have moved white to black or vice versa? // Scanning black in state 0,2 and white in state 1, so if we find the wrong // color, advance to next state or end if we are in state 2 already - if ((state == 1) == self.image.get(realX as u32, realY as u32)) { - if (state == 2) { + if (state == 1) == self.image.get(realX as u32, realY as u32) { + if state == 2 { return MathUtils::distance_int(x, y, fromX as i32, fromY as i32); } state += 1; } error += dy; - if (error > 0) { - if (y == toY as i32) { + if error > 0 { + if y == toY as i32 { break; } y += ystep; @@ -429,7 +429,7 @@ impl Detector { // Found black-white-black; give the benefit of the doubt that the next pixel outside the image // is "white" so this last point at (toX+xStep,toY) is the right ending. This is really a // small approximation; (toX+xStep,toY+yStep) might be really correct. Ignore this. - if (state == 2) { + if state == 2 { return MathUtils::distance_int( toX as i32 + xstep as i32, toY as i32, diff --git a/src/qrcode/detector/finder_pattern_finder.rs b/src/qrcode/detector/finder_pattern_finder.rs index 1af1ef8..00261a1 100755 --- a/src/qrcode/detector/finder_pattern_finder.rs +++ b/src/qrcode/detector/finder_pattern_finder.rs @@ -234,7 +234,7 @@ impl FinderPatternFinder { } totalModuleSize += count; } - if (totalModuleSize < 7) { + if totalModuleSize < 7 { return false; } let moduleSize = totalModuleSize as f32 / 7.0; diff --git a/tests/common/abstract_black_box_test_case.rs b/tests/common/abstract_black_box_test_case.rs index bb1d1a9..0ba1706 100644 --- a/tests/common/abstract_black_box_test_case.rs +++ b/tests/common/abstract_black_box_test_case.rs @@ -235,14 +235,14 @@ impl AbstractBlackBoxTestCase { let source = BufferedImageLuminanceSource::new(rotated_image); let bitmap = BinaryBitmap::new(Box::new(HybridBinarizer::new(Box::new(source)))); - // #[cfg(test)] - // if file_base_name == "13" { - // let mut f = File::create("test_file_output.txt").unwrap(); - // dbg!("dumb"); - // write!(f,"{}", bitmap.getBlackMatrix().unwrap()); - // drop(f); - // Self::rotate_image(&image, rotation).save("test_image.png").unwrap(); - // } + #[cfg(test)] + if file_base_name == "14" { + let mut f = File::create("test_file_output.txt").unwrap(); + dbg!("dumb"); + write!(f,"{}", bitmap.getBlackMatrix().unwrap()); + drop(f); + Self::rotate_image(&image, rotation).save("test_image.png").unwrap(); + } if let Ok(decoded) = self.decode(&bitmap, rotation, &expected_text, &expected_metadata, false)