Merge pull request #98 from rxing-core/fixes/97-binary-eci

fix: fix an issue with ECI encoding markers above 170 (Binary == 899)

Author: hschimke

src/common/eci.rs

@@ -40,11 +40,37 @@ pub enum Eci {
     Binary = 899,
 }
 
+const ECI_8: u64 = 0b0000_0000;
+const ECI_16: u64 = 0b1000_0000_0000_0000;
+const ECI_24: u64 = 0b1100_0000_0000_0000_0000_0000;
+
 impl Eci {
     pub const fn can_encode(self) -> bool {
         (self as i32) >= 899
     }
 
+    pub const fn get_bitwidth(self) -> u8 {
+        match self as u64 {
+            0..=127 => 8,
+            128..=16383 => 16,
+            _ => 24,
+        }
+    }
+
+    pub const fn get_qreci_encode_bits(self) -> u64 {
+        match self as u64 {
+            0..=127 => ECI_8 | (self as u64),
+            128..=16383 => ECI_16 | (self as u64),
+            16384..=999999 => ECI_24 | (self as u64),
+            _ => self as u64,
+            // Self::Binary => {
+            //     let raw_bits = self as u64;
+            //     ECI_16 | raw_bits
+            // },
+            // _ => ECI_8 | (self as u64),
+        }
+    }
+
     // pub fn try_from_i32(value: i32) -> Result<Self> {
     //     let v = Self::from(value);
     //     if v == Eci::Unknown {
@@ -100,7 +126,7 @@ impl From<i32> for Eci {
             34 => Eci::UTF32BE,
             35 => Eci::UTF32LE,
             170 => Eci::ASCII,
-            898 => Eci::Binary,
+            898 | 899 => Eci::Binary,
             _ => Eci::Unknown,
         }
     }

src/qrcode/encoder/qrcode_encoder.rs

@@ -717,6 +717,11 @@ pub fn appendKanjiBytes(content: &str, bits: &mut BitArray) -> Result<()> {
 
 fn appendECI(eci: Eci, bits: &mut BitArray) -> Result<()> {
     bits.appendBits(Mode::ECI.getBits() as BitFieldBaseType, 4)?;
-    // This is correct for values up to 127, which is all we need now.
-    bits.appendBits(eci as BitFieldBaseType, 8)
+    // This is correct for values up to 16383, the only ECI we have over 127 is Binary.
+    // For values over 16383 (eci can reach 999999), we need to use the 3-byte encoding,
+    // which is implemented but disabled.
+    bits.appendBits(
+        eci.get_qreci_encode_bits() as BitFieldBaseType,
+        eci.get_bitwidth() as usize,
+    )
 }