Merge pull request #3844 from CloudlessMoon/master

dreampiggy · web-flow · commit f8bd0c0ffc6f · 2025-09-29T11:44:58.000+08:00
Switched image encoding to a context-aware approach with a safe fallback, allowing per-request encoder selection without changing the public API.
diff --git a/SDWebImage/Core/SDImageCache.m b/SDWebImage/Core/SDImageCache.m
@@ -279,7 +279,11 @@ - (void)storeImage:(nullable UIImage *)image
                     format = [SDImageCoderHelper CGImageContainsAlpha:image.CGImage] ? SDImageFormatPNG : SDImageFormatJPEG;
                 }
             }
-            NSData *encodedData = [[SDImageCodersManager sharedManager] encodedDataWithImage:image format:format options:context[SDWebImageContextImageEncodeOptions]];
+            id<SDImageCoder> imageCoder = context[SDWebImageContextImageCoder];
+            if (!imageCoder) {
+                imageCoder = [SDImageCodersManager sharedManager];
+            }
+            NSData *encodedData = [imageCoder encodedDataWithImage:image format:format options:context[SDWebImageContextImageEncodeOptions]];
             dispatch_async(self.ioQueue, ^{
                 [self _storeImageDataToDisk:encodedData forKey:key];
                 [self _archivedDataWithImage:image forKey:key];

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,11 @@ - (void)storeImage:(nullable UIImage *)image`
`279`	`279`	`format = [SDImageCoderHelper CGImageContainsAlpha:image.CGImage] ? SDImageFormatPNG : SDImageFormatJPEG;`
`280`	`280`	`}`
`281`	`281`	`}`
`282`		`- NSData *encodedData = [[SDImageCodersManager sharedManager] encodedDataWithImage:image format:format options:context[SDWebImageContextImageEncodeOptions]];`
	`282`	`+ id<SDImageCoder> imageCoder = context[SDWebImageContextImageCoder];`
	`283`	`+ if (!imageCoder) {`
	`284`	`+ imageCoder = [SDImageCodersManager sharedManager];`
	`285`	`+ }`
	`286`	`+ NSData *encodedData = [imageCoder encodedDataWithImage:image format:format options:context[SDWebImageContextImageEncodeOptions]];`
`283`	`287`	`dispatch_async(self.ioQueue, ^{`
`284`	`288`	`[self _storeImageDataToDisk:encodedData forKey:key];`
`285`	`289`	`[self _archivedDataWithImage:image forKey:key];`