G2/lbee-utils
1
0
Fork 0
mirror of https://github.com/G2-Games/lbee-utils.git synced 2025-04-19 23:32:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed merge conflict

Browse source
This commit is contained in:
G2-Games 2024-05-08 09:42:28 -05:00
parent ae94c46aa8
commit 252f382099
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cz/src/formats/cz4.rs
View file

@ -114,12 +114,10 @@ impl CzImage for Cz4Image {
todo!() todo!()
} }
<<<<<<< HEAD
fn set_bitmap(&mut self, bitmap: &[u8], width: u16, height: u16) { fn set_bitmap(&mut self, bitmap: &[u8], width: u16, height: u16) {
todo!()
=======
fn set_bitmap(&mut self, bitmap: &[u8], header: &Self::Header) {
self.bitmap = bitmap.to_vec(); self.bitmap = bitmap.to_vec();
>>>>>>> 613e38c6b560990c77e994f2359fc4c30ff112a4
self.header.common.width = width;
self.header.common.height = height;
} }
} }