Merge pull request #287 from LedgerHQ/y333/nano_nbgl_icon_management

Update include_gif for Nano NBGL

Author: yogh333

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "include_gif"
-version = "1.2.3"
+version = "1.2.4"
 edition = "2021"
 license.workspace = true
 repository.workspace = true

include_gif/Cargo.toml

@@ -21,22 +21,6 @@ enum Input {
     FileNameAndType(LitStr, GlyphType),
 }
 
-const MASK: [u8; 196] = [
-    0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0x00, 0x00, 0x00,
-];
-
 impl syn::parse::Parse for Input {
     fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
         // Parse the filename
@@ -153,7 +137,7 @@ fn generate_bagl_glyph(frame: &GrayImage) -> Vec<u8> {
     packed
 }
 
-fn image_to_packed_buffer(frame: &mut GrayImage) -> (Vec<u8>, u8) {
+fn image_to_packed_buffer(frame: &mut GrayImage, invert: bool) -> (Vec<u8>, u8) {
     // Count the number of colors in the image (max 16 supported)
     let mut color_count = std::collections::HashSet::new();
     for pixel in frame.pixels() {
@@ -172,7 +156,7 @@ fn image_to_packed_buffer(frame: &mut GrayImage) -> (Vec<u8>, u8) {
     }
 
     // Invert if bpp is 1
-    if bits_per_pixel == 1 {
+    if bits_per_pixel == 1 && invert {
         for pixel in frame.pixels_mut() {
             pixel.0[0] = 255 - pixel.0[0];
         }
@@ -211,18 +195,10 @@ fn image_to_packed_buffer(frame: &mut GrayImage) -> (Vec<u8>, u8) {
 fn generate_nbgl_glyph(frame: &mut GrayImage) -> (Vec<u8>, u8, bool) {
     // Special case for 14x14 images (Nano S+ and Nano X)
     if frame.width() == 14 && frame.height() == 14 {
-        frame.enumerate_pixels_mut().for_each(|(x, y, pixel)| {
-            let luma = pixel[0];
-            if MASK[(y * 14 + x) as usize] == 0xFF && luma == 0 {
-                *pixel = Luma([255; 1]);
-            } else {
-                *pixel = Luma([0; 1]);
-            }
-        });
-        let (packed, bpp) = image_to_packed_buffer(frame);
+        let (packed, bpp) = image_to_packed_buffer(frame, false);
         return (packed, bpp, false);
     }
-    let (packed, bpp) = image_to_packed_buffer(frame);
+    let (packed, bpp) = image_to_packed_buffer(frame, true);
     let mut compressed_image: Vec<u8> = Vec::new();
     let mut full_uncompressed_size = packed.len();
     let mut i = 0;

include_gif/src/lib.rs

@@ -1,6 +1,6 @@
 [package]
 name = "ledger_device_sdk"
-version = "1.24.6"
+version = "1.24.7"
 authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"]
 edition = "2021"
 license.workspace = true
@@ -15,7 +15,7 @@ ledger_device_sdk = { path = ".", features = ["speculos"] }
 testmacro = { path = "../testmacro", version = "0.1.0"}
 
 [dependencies]
-include_gif = {path = "../include_gif", version = "1.2.3"}
+include_gif = {path = "../include_gif", version = "1.2.4"}
 num-traits = { version = "0.2.14", default-features = false }
 rand_core = { version = "0.6.3", default-features = false }
 zeroize = { version = "1.6.0", default-features = false }