Merge pull request #1837 from fintelia/issue-1836

Andreas Molzer · web-flow · commit c890d3be469a · 2023-02-01T20:06:17.000+01:00
Support ICO files with dimensions larger than 256
diff --git a/src/codecs/ico/decoder.rs b/src/codecs/ico/decoder.rs
@@ -231,7 +231,8 @@ impl DirEntry {
     }
 
     fn matches_dimensions(&self, width: u32, height: u32) -> bool {
-        u32::from(self.real_width()) == width && u32::from(self.real_height()) == height
+        u32::from(self.real_width()) == width.min(256)
+            && u32::from(self.real_height()) == height.min(256)
     }
 
     fn seek_to_start<R: Read + Seek>(&self, r: &mut R) -> ImageResult<()> {

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,8 @@ impl DirEntry {`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`fn matches_dimensions(&self, width: u32, height: u32) -> bool {`
`234`		`- u32::from(self.real_width()) == width && u32::from(self.real_height()) == height`
	`234`	`+ u32::from(self.real_width()) == width.min(256)`
	`235`	`+ && u32::from(self.real_height()) == height.min(256)`
`235`	`236`	`}`
`236`	`237`
`237`	`238`	`fn seek_to_start<R: Read + Seek>(&self, r: &mut R) -> ImageResult<()> {`