Fixing QR code reading (see WanzenBug/rqrr#2).

Cargo.toml

@@ -7,12 +7,12 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rqrr = "0.2.0"
-image = "0.23.7"
+rqrr = "0.2.1"
+image = "0.21.3"
 clap = "2.33.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 base64 = "0.12.3"
 log = "0.4.11"
 simple_logger = "1.6.0"
-qrcode = "0.11"
+qrcode = { version = "0.11", default-features = true }

src/main.rs

@@ -23,7 +23,7 @@ fn main() {
         )
     ).get_matches();
 
-    if let Some(matches) = matches.subcommand_matches("qrtest") {
+    if let Some(matches) = matches.subcommand_matches("qrread") {
         let filename = matches.value_of("file").expect("file name required");
         info!("Loading image {} ...", filename);
         let img = open(filename).expect("image invalid").to_rgb();

src/qr_writer.rs

@@ -1,27 +1,40 @@
 use qrcode::QrCode;
-use qrcode::types::QrError;
-use image::{Rgb, ImageBuffer};
+use qrcode::types::{QrError, Color};
+use image::{Rgb, RgbImage};
 
 use crate::symbol;
 
-enum QrEncodeError {
+pub enum QrEncodeError {
     EncodingLibError(QrError),
 }
 
-type QrEncodeResult = Result<ImageBuffer<Rgb<u8>, Vec<u8>>, QrEncodeError>;
+pub type QrEncodeResult = Result<RgbImage, QrEncodeError>;
 
 pub fn symbol_to_qrcode(symb: symbol::Symbol) -> QrEncodeResult {
     string_to_qrcode(symb.to_str())
 }
 
+fn qrcode_to_image(code: QrCode) -> RgbImage {
+    let width = code.width() as u32;
+    let mut img = RgbImage::new(width+8, width+8); // leaving 4 pixels for the quiet zone
+    let colors = code.to_colors();
+    let mut colors_iter = colors.iter();
+    for x in 4..=(width+4) {
+        for y in 4..=(width+4) {
+            let pixel = colors_iter.next().unwrap_or(&Color::Light);
+            img.put_pixel(x, y, pixel.select(Rgb([0,0,0]), Rgb([255,255,255])));
+        }
+    }
+    img
+}
+
 pub fn string_to_qrcode(data: String) -> QrEncodeResult {
     let code = QrCode::new(data);
     let to_render;
     match code {
         Ok(res) => {to_render = res;},
         Err(error) => {return Err(QrEncodeError::EncodingLibError(error));}
     }
-    let img = to_render.render::<Rgb<u8>>().build();
-//                    .light_color(Rgb([255, 255, 255])).build();
+    let img = qrcode_to_image(to_render);
     Ok(img)
 }

src/symbol.rs

@@ -110,6 +110,6 @@ impl ContentSymbol {
         Ok(ContentSymbol{ sequence: seq, index: ind, data: data })
     }
     pub fn to_str(&self) -> String {
-        format!("{:02x}{:x}@{}", self.sequence, self.index, encode(self.data))
+        format!("{:02x}{:x}@{}", self.sequence, self.index, encode(&self.data))
     }
 }