mirror of
https://github.com/starovoid/rxing.git
synced 2026-07-26 04:12:34 +00:00
Cleanup of many components of the code.
Many unwraps, expects, and panics removed or handled. More rustification of the codebase. Squashed commit of the following: commit 80c6483cf8c819496a7b781f9e3a149d1f18d5fe Author: Henry <henry@azule.info> Date: Fri Feb 10 20:36:57 2023 -0600 add other parsed result option commit 412d92ae585e7bf194697f5282dbc045e448bace Author: Henry <henry@azule.info> Date: Fri Feb 10 19:06:34 2023 -0600 fix some panics commit 9108d3e931aadec00fc0bf346ebc52d24e5d8146 Author: Henry <henry@azule.info> Date: Fri Feb 10 18:56:30 2023 -0600 clippy --fix commit 8cd89d314323f54f342f15fc73297b62d418ac79 Author: Henry <henry@azule.info> Date: Fri Feb 10 18:55:45 2023 -0600 some more cleanup in aztec commit fb7f9242e273b85a4bb212f22a185a0dcbfafc36 Author: Henry <henry@azule.info> Date: Fri Feb 10 18:19:54 2023 -0600 cleanup root commit 4fb7c0639830869149332b29be789e891eade3e7 Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 16:50:15 2023 -0600 format commit 3ac271af657b25fbe5ee39cbdf8859e5aa38ea41 Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 16:43:14 2023 -0600 clippy --fix commit 0c5b4c1477159db93a9da9645039f51cd1a7c574 Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 16:04:31 2023 -0600 qrcode cleanup complete commit 70c1d107cc672e45d46567c650c46fece7e7da9c Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 13:28:25 2023 -0600 clippy --fix commit e13263d0f1f2a13dbb59b6e60d8b871a32babc92 Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 13:27:44 2023 -0600 qrcode detector cleanup commit f7f2855099e469fe1091868c6099196705d0ae83 Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 11:48:13 2023 -0600 qrcode decoder commit bdbaaba597b3479639c2ed3726465a69e3004471 Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 11:13:18 2023 -0600 clippy --fix commit fd6dbcaeb1f45dc91ae98f0e7c58aad48d67df78 Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 11:12:28 2023 -0600 pdf417 cleanup complete commit 7bbd47604c2639a5eb61bdb5533e71be3bce95a1 Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 10:39:28 2023 -0600 clippy --fix commit 8f4962b7bb5f133524fe4d3d4948e5672a88c545 Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 10:39:00 2023 -0600 cleanup on pdf417 hie commit 254c8243953776d3c8704dd81529aadd05d5a94e Author: Henry <henry@azule.info> Date: Fri Feb 10 02:51:21 2023 +0000 partway through pdf417 hle commit d4a5b00fde8c0282b0c6e4175a21c1e111b11533 Author: Henry <henry@azule.info> Date: Wed Feb 8 21:35:25 2023 +0000 clippy --fix commit 2bd4a8e218aa963a88997b50bc5a198f9a88205e Author: Henry <henry@azule.info> Date: Wed Feb 8 21:31:55 2023 +0000 pdf417 decode and detect cleanup commit 05130ac54a72c2303045d64507bf6185aa74e531 Author: Henry Schimke <henry@azule.info> Date: Tue Feb 7 08:06:25 2023 -0600 at decodeTextCompaction in decoded_bit_straem_parser commit 924c023a7d2339dfffa6ef0c4a805fb192576796 Author: Henry Schimke <henry@azule.info> Date: Mon Feb 6 18:22:02 2023 -0600 clippy --fix commit 5cfb81a885c22b4b5ec937a79be31d0815def211 Author: Henry Schimke <henry@azule.info> Date: Mon Feb 6 18:20:22 2023 -0600 oned cleanup commit 0649b64854baf56a8e3314728d4f6cf4063db8b2 Author: Henry Schimke <henry@azule.info> Date: Mon Feb 6 11:47:28 2023 -0600 rss cleanup commit 2d3127898fc11f7e65d590e983cda799b798b646 Author: Henry Schimke <henry@azule.info> Date: Mon Feb 6 10:19:56 2023 -0600 multi cleanup commit 7e8b43a159083a2096123e6204d4d1d359c59981 Author: Henry <henry@azule.info> Date: Sun Feb 5 21:41:59 2023 -0600 cargo fmt commit df8285e8da07b4bffd48ca6e596de3f010eb8d9e Author: Henry <henry@azule.info> Date: Sun Feb 5 21:41:29 2023 -0600 maxicode cleanup commit a51f923a14016eb416ca202b2194258808dde3e7 Author: Henry <henry@azule.info> Date: Sun Feb 5 21:27:57 2023 -0600 cargo fmt commit 332d7eef4a25318611025a3fcb0b70c604d917be Author: Henry <henry@azule.info> Date: Sun Feb 5 21:27:48 2023 -0600 cleanup datamatrix commit eb2311c476a9c9993f271ab6cf9fd359aedca26f Author: Henry <henry@azule.info> Date: Sun Feb 5 21:27:26 2023 -0600 cargo clippy --fix commit 2abaa4c51d287f619d4c7a438f85ba2a30f159cf Author: Henry <henry@azule.info> Date: Sun Feb 5 19:13:02 2023 -0600 finish cleanup in parsers commit 716aa2fbf728716cff36657a5fd80e7bca5276b7 Author: Henry Schimke <henry@azule.info> Date: Sun Feb 5 17:44:56 2023 -0600 cleanup continues commit 7d843788a49fa9cc82c4616d226c0f882e73612b Author: Henry Schimke <henry@azule.info> Date: Sun Feb 5 15:15:09 2023 -0600 common cleanup commit fd251866c68f22d450dd428c93d7a3620bf1be27 Author: Henry Schimke <henry@azule.info> Date: Sun Feb 5 10:24:54 2023 -0600 cleanup reedsolomon commit 132e27ed1468f5c1ce998516ff5a00687217c3e6 Author: Henry Schimke <henry@azule.info> Date: Sun Feb 5 09:52:04 2023 -0600 make MathUtils more generic commit d8352b7fff4cb4f9ecc8e8a969710d26ef410e8b Author: Henry Schimke <henry@azule.info> Date: Sun Feb 5 09:29:33 2023 -0600 cleanup some string handling in ResultParser There may still be some edge cases where multi-byte characters break the parser
This commit is contained in:
Henry
@@ -54,46 +54,6 @@ impl BufferedImageLuminanceSource {
|
||||
width: usize,
|
||||
height: usize,
|
||||
) -> Self {
|
||||
// if image.getType() == BufferedImage.TYPE_BYTE_GRAY {
|
||||
// this.image = image;
|
||||
// } else {
|
||||
// int sourceWidth = image.getWidth();
|
||||
// int sourceHeight = image.getHeight();
|
||||
// if (left + width > sourceWidth || top + height > sourceHeight) {
|
||||
// throw new IllegalArgumentException("Crop rectangle does not fit within image data.");
|
||||
// }
|
||||
|
||||
// this.image = new BufferedImage(sourceWidth, sourceHeight, BufferedImage.TYPE_BYTE_GRAY);
|
||||
|
||||
// WritableRaster raster = this.image.getRaster();
|
||||
// int[] buffer = new int[width];
|
||||
// for (int y = top; y < top + height; y++) {
|
||||
// image.getRGB(left, y, width, 1, buffer, 0, sourceWidth);
|
||||
// for (int x = 0; x < width; x++) {
|
||||
// int pixel = buffer[x];
|
||||
|
||||
// // The color of fully-transparent pixels is irrelevant. They are often, technically, fully-transparent
|
||||
// // black (0 alpha, and then 0 RGB). They are often used, of course as the "white" area in a
|
||||
// // barcode image. Force any such pixel to be white:
|
||||
// if ((pixel & 0xFF000000) == 0) {
|
||||
// // white, so we know its luminance is 255
|
||||
// buffer[x] = 0xFF;
|
||||
// } else {
|
||||
// // .299R + 0.587G + 0.114B (YUV/YIQ for PAL and NTSC),
|
||||
// // (306*R) >> 10 is approximately equal to R*0.299, and so on.
|
||||
// // 0x200 >> 10 is 0.5, it implements rounding.
|
||||
// buffer[x] =
|
||||
// (306 * ((pixel >> 16) & 0xFF) +
|
||||
// 601 * ((pixel >> 8) & 0xFF) +
|
||||
// 117 * (pixel & 0xFF) +
|
||||
// 0x200) >> 10;
|
||||
// }
|
||||
// }
|
||||
// raster.setPixels(left, y, width, 1, buffer);
|
||||
// }
|
||||
|
||||
// }
|
||||
|
||||
let img = image.to_rgba8();
|
||||
|
||||
let mut raster: ImageBuffer<_, Vec<_>> = ImageBuffer::new(image.width(), image.height());
|
||||
@@ -116,29 +76,6 @@ impl BufferedImageLuminanceSource {
|
||||
}
|
||||
}
|
||||
|
||||
// for pixel in img.pixels() {
|
||||
// // The color of fully-transparent pixels is irrelevant. They are often, technically, fully-transparent
|
||||
// // black (0 alpha, and then 0 RGB). They are often used, of course as the "white" area in a
|
||||
// // barcode image. Force any such pixel to be white:
|
||||
// let [red,green,blue,alpha] = pixel.0;
|
||||
// if (alpha & 0xFF) == 0 {
|
||||
// // white, so we know its luminance is 255
|
||||
// raster.push(0xFF);
|
||||
// // buffer[x] = 0xFF;
|
||||
// } else {
|
||||
// // .299R + 0.587G + 0.114B (YUV/YIQ for PAL and NTSC),
|
||||
// // (306*R) >> 10 is approximately equal to R*0.299, and so on.
|
||||
// // 0x200 >> 10 is 0.5, it implements rounding.
|
||||
// raster.push((
|
||||
// (306 * ((red as u32 >> 16) & 0xFF) +
|
||||
// 601 * ((green as u32 >> 8) & 0xFF) +
|
||||
// 117 * (blue as u32 & 0xFF) +
|
||||
// 0x200) >> 10) as u8);
|
||||
// }
|
||||
// }
|
||||
|
||||
// let ib:ImageBuffer<Luma<u8>, Vec<u8>> = ImageBuffer::from_raw(image.width() , image.height(), raster).unwrap();
|
||||
|
||||
Self {
|
||||
image: Rc::new(DynamicImage::from(raster)),
|
||||
width,
|
||||
@@ -146,14 +83,6 @@ impl BufferedImageLuminanceSource {
|
||||
left,
|
||||
top,
|
||||
}
|
||||
|
||||
// Self {
|
||||
// image: DynamicImage::from(image.to_luma8()),
|
||||
// width: width,
|
||||
// height: height,
|
||||
// left: left,
|
||||
// top: top,
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -161,20 +90,19 @@ impl LuminanceSource for BufferedImageLuminanceSource {
|
||||
fn getRow(&self, y: usize) -> Vec<u8> {
|
||||
let width = self.getWidth(); // - self.left as usize;
|
||||
|
||||
let pixels: Vec<u8> = self
|
||||
.image
|
||||
.as_luma8()
|
||||
.unwrap()
|
||||
.rows()
|
||||
.nth(y + self.top as usize)
|
||||
.unwrap()
|
||||
.skip(self.left as usize)
|
||||
.take(width)
|
||||
.map(|&p| p.0[0])
|
||||
.collect();
|
||||
|
||||
// The underlying raster of image consists of bytes with the luminance values
|
||||
// row[..width].clone_from_slice(&pixels[..]);
|
||||
let pixels: Vec<u8> = || -> Option<Vec<u8>> {
|
||||
Some(
|
||||
self.image
|
||||
.as_luma8()?
|
||||
.rows()
|
||||
.nth(y + self.top as usize)?
|
||||
.skip(self.left as usize)
|
||||
.take(width)
|
||||
.map(|&p| p.0[0])
|
||||
.collect(),
|
||||
)
|
||||
}()
|
||||
.unwrap_or_default();
|
||||
|
||||
pixels
|
||||
}
|
||||
@@ -221,7 +149,6 @@ impl LuminanceSource for BufferedImageLuminanceSource {
|
||||
}
|
||||
|
||||
fn invert(&mut self) {
|
||||
// self.image.borrow_mut().invert();
|
||||
let mut img = (*self.image).clone();
|
||||
img.invert();
|
||||
self.image = Rc::new(img);
|
||||
@@ -238,18 +165,7 @@ impl LuminanceSource for BufferedImageLuminanceSource {
|
||||
width: usize,
|
||||
height: usize,
|
||||
) -> Result<Box<dyn LuminanceSource>, crate::exceptions::Exceptions> {
|
||||
// Ok(Box::new(BufferedImageLuminanceSource::with_details(
|
||||
// self.image
|
||||
// .crop_imm(left as u32, top as u32, width as u32, height as u32),
|
||||
// self.left + left as u32,
|
||||
// self.top + top as u32,
|
||||
// width,
|
||||
// height,
|
||||
// )))
|
||||
Ok(Box::new(Self {
|
||||
// image: self
|
||||
// .image
|
||||
// .crop_imm(left as u32, top as u32, width as u32, height as u32),
|
||||
image: self.image.clone(),
|
||||
width,
|
||||
height,
|
||||
@@ -265,9 +181,6 @@ impl LuminanceSource for BufferedImageLuminanceSource {
|
||||
fn rotateCounterClockwise(
|
||||
&self,
|
||||
) -> Result<Box<dyn LuminanceSource>, crate::exceptions::Exceptions> {
|
||||
// Ok(Box::new(BufferedImageLuminanceSource::new(
|
||||
// self.image.rotate270(),
|
||||
// )))
|
||||
let img = self.image.rotate270();
|
||||
Ok(Box::new(Self {
|
||||
width: img.width() as usize,
|
||||
@@ -290,7 +203,6 @@ impl LuminanceSource for BufferedImageLuminanceSource {
|
||||
|
||||
let new_img = DynamicImage::from(img);
|
||||
|
||||
// Ok(Box::new(BufferedImageLuminanceSource::new(new_img)))
|
||||
Ok(Box::new(Self {
|
||||
width: new_img.width() as usize,
|
||||
height: new_img.height() as usize,
|
||||
|
||||
Reference in New Issue
Block a user