Merge pull request #66 from SDWebImage/fix_encode_maxPixelSize

dreampiggy · web-flow · commit 2a6c8fac7d48 · 2022-06-22T17:03:13.000+08:00
Fix the encoding maxPixelSize logic (patch)
diff --git a/SDWebImageWebPCoder/Classes/SDImageWebPCoder.m b/SDWebImageWebPCoder/Classes/SDImageWebPCoder.m
@@ -860,7 +860,7 @@ - (nullable NSData *)sd_encodedWebpDataWithImage:(nullable CGImageRef)imageRef
     }
     
     // Check if need to scale pixel size
-    if (maxPixelSize.width > 0 && maxPixelSize.height > 0 && width > maxPixelSize.width && height > maxPixelSize.height) {
+    if (maxPixelSize.width > 0 && maxPixelSize.height > 0 && (width > maxPixelSize.width || height > maxPixelSize.height)) {
         CGSize scaledSize = SDCalculateThumbnailSize(CGSizeMake(width, height), YES, maxPixelSize);
         result = WebPPictureRescale(&picture, scaledSize.width, scaledSize.height);
         if (!result) {

Original file line number	Diff line number	Diff line change
`@@ -860,7 +860,7 @@ - (nullable NSData *)sd_encodedWebpDataWithImage:(nullable CGImageRef)imageRef`
`860`	`860`	`}`
`861`	`861`
`862`	`862`	`// Check if need to scale pixel size`
`863`		`- if (maxPixelSize.width > 0 && maxPixelSize.height > 0 && width > maxPixelSize.width && height > maxPixelSize.height) {`
	`863`	`+ if (maxPixelSize.width > 0 && maxPixelSize.height > 0 && (width > maxPixelSize.width \|\| height > maxPixelSize.height)) {`
`864`	`864`	`CGSize scaledSize = SDCalculateThumbnailSize(CGSizeMake(width, height), YES, maxPixelSize);`
`865`	`865`	`result = WebPPictureRescale(&picture, scaledSize.width, scaledSize.height);`
`866`	`866`	`if (!result) {`