From dc5d7d189d44c57c929cb878129943dddb3dbd8a Mon Sep 17 00:00:00 2001 From: DreamPiggy Date: Thu, 28 Dec 2017 16:06:37 +0800 Subject: [PATCH] Rename UIImage+ForceDecode method with sd prefix to avoid name conflict --- SDWebImage/UIImage+ForceDecode.h | 4 ++-- SDWebImage/UIImage+ForceDecode.m | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SDWebImage/UIImage+ForceDecode.h b/SDWebImage/UIImage+ForceDecode.h index 708c37b0..e8ef5340 100644 --- a/SDWebImage/UIImage+ForceDecode.h +++ b/SDWebImage/UIImage+ForceDecode.h @@ -10,8 +10,8 @@ @interface UIImage (ForceDecode) -+ (nullable UIImage *)decodedImageWithImage:(nullable UIImage *)image; ++ (nullable UIImage *)sd_decodedImageWithImage:(nullable UIImage *)image; -+ (nullable UIImage *)decodedAndScaledDownImageWithImage:(nullable UIImage *)image; ++ (nullable UIImage *)sd_decodedAndScaledDownImageWithImage:(nullable UIImage *)image; @end diff --git a/SDWebImage/UIImage+ForceDecode.m b/SDWebImage/UIImage+ForceDecode.m index ee55aee7..2f25f047 100644 --- a/SDWebImage/UIImage+ForceDecode.m +++ b/SDWebImage/UIImage+ForceDecode.m @@ -11,7 +11,7 @@ @implementation UIImage (ForceDecode) -+ (UIImage *)decodedImageWithImage:(UIImage *)image { ++ (UIImage *)sd_decodedImageWithImage:(UIImage *)image { if (!image) { return nil; } @@ -19,7 +19,7 @@ return [[SDWebImageCodersManager sharedInstance] decompressedImageWithImage:image data:&tempData options:@{SDWebImageCoderScaleDownLargeImagesKey: @(NO)}]; } -+ (UIImage *)decodedAndScaledDownImageWithImage:(UIImage *)image { ++ (UIImage *)sd_decodedAndScaledDownImageWithImage:(UIImage *)image { if (!image) { return nil; }