Bump image from 0.21.3 to 0.22.3. Closes #238

Author: iceiix

Cargo.lock

@@ -30,7 +30,7 @@ serde = "1.0.104"
 serde_json = "1.0.44"
 flate2 = { version = "1.0.13", features = ["rust_backend"], default-features = false }
 zip = { version = "0.5.3", features = ["deflate"], default-features = false }
-image = "0.21.3"
+image = "0.22.3"
 rand = "0.6.5"
 rand_xorshift = "0.1.1"
 hex = "0.4.0"

Cargo.toml

@@ -933,9 +933,9 @@ fn calculate_biome(snapshot: &world::Snapshot, x: i32, z: i32, img: &image::Dyna
 
             let col = img.get_pixel(ix as u32, iy as u32);
             let col = bi.process_color(col);
-            r += col.data[0] as u32;
-            g += col.data[1] as u32;
-            b += col.data[2] as u32;
+            r += col.0[0] as u32;
+            g += col.0[1] as u32;
+            b += col.0[2] as u32;
             count += 1;
         }
     }

src/model/mod.rs

@@ -942,7 +942,7 @@ impl TextureManager {
             for x in bl.0 .. (bl.0 + bl.2) {
                 for y in bl.1 .. (bl.1 + bl.3) {
                     let mut col = img.get_pixel(x, y);
-                    col.data[3] = 255;
+                    col.0[3] = 255;
                     img.put_pixel(x, y, col);
                 }
             }

src/render/mod.rs

@@ -273,7 +273,7 @@ impl UIState {
                     let mut start = true;
                     'x_loop: for x in 0..sw {
                         for y in 0..sh {
-                            let a = img.get_pixel(cx + x, cy + y).data[3];
+                            let a = img.get_pixel(cx + x, cy + y).0[3];
                             if start && a != 0 {
                                 self.font_character_info[i as usize].0 = x as i32;
                                 start = false;

src/render/ui.rs

@@ -30,14 +30,14 @@ impl Biome {
 
     pub fn process_color(self, col: Rgba<u8>) -> Rgba<u8> {
         if self.id == ROOFED_FOREST.id || self.id == ROOFED_FOREST_MOUNTAINS.id {
-            Rgba {
-                data: [
-                    ((col.data[0] as u32 + 0x28) / 2) as u8,
-                    ((col.data[1] as u32 + 0x34) / 2) as u8,
-                    ((col.data[2] as u32 + 0x0A) / 2) as u8,
+            Rgba (
+                [
+                    ((col.0[0] as u32 + 0x28) / 2) as u8,
+                    ((col.0[1] as u32 + 0x34) / 2) as u8,
+                    ((col.0[2] as u32 + 0x0A) / 2) as u8,
                     255
                 ]
-            }
+            )
         } else {
             col
         }