# HG changeset patch # User unC0Rr # Date 1737494068 -3600 # Node ID 3f73daa3f2123434f4b3c889316664fe69f37b00 # Parent 2acea266d2974b8615ea8dd688cda406f3fb17b7 Adopt newer version of png lib diff -r 2acea266d297 -r 3f73daa3f212 rust/mapgen/Cargo.toml --- a/rust/mapgen/Cargo.toml Tue Jan 21 22:10:55 2025 +0100 +++ b/rust/mapgen/Cargo.toml Tue Jan 21 22:14:28 2025 +0100 @@ -15,4 +15,4 @@ serde = "1.0" serde_yaml = "0.9" serde_derive = "1.0" -png = "0.13" +png = "0.17" diff -r 2acea266d297 -r 3f73daa3f212 rust/mapgen/src/theme.rs --- a/rust/mapgen/src/theme.rs Tue Jan 21 22:10:55 2025 +0100 +++ b/rust/mapgen/src/theme.rs Tue Jan 21 22:14:28 2025 +0100 @@ -228,9 +228,10 @@ fn load_sprite(path: &Path) -> Result { let decoder = Decoder::new(BufReader::new(File::open(path)?)); - let (info, mut reader) = decoder.read_info()?; + let mut reader = decoder.read_info()?; + let info = reader.info(); - if info.color_type != ColorType::RGBA { + if info.color_type != ColorType::Rgba { return Err(ThemeLoadError::Format(format!( "Unexpected format: {:?}", info.color_type