diff --git a/SDWebImage.xcodeproj/project.pbxproj b/SDWebImage.xcodeproj/project.pbxproj index 0607de48..cf04e41b 100644 --- a/SDWebImage.xcodeproj/project.pbxproj +++ b/SDWebImage.xcodeproj/project.pbxproj @@ -87,30 +87,30 @@ 321E608F1F38E8C800405457 /* SDImageCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60851F38E8C800405457 /* SDImageCoder.m */; }; 321E60901F38E8C800405457 /* SDImageCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60851F38E8C800405457 /* SDImageCoder.m */; }; 321E60911F38E8C800405457 /* SDImageCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60851F38E8C800405457 /* SDImageCoder.m */; }; - 321E60941F38E8ED00405457 /* SDWebImageImageIOCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60921F38E8ED00405457 /* SDWebImageImageIOCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 321E60951F38E8ED00405457 /* SDWebImageImageIOCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60921F38E8ED00405457 /* SDWebImageImageIOCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 321E60961F38E8ED00405457 /* SDWebImageImageIOCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60921F38E8ED00405457 /* SDWebImageImageIOCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 321E60971F38E8ED00405457 /* SDWebImageImageIOCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60921F38E8ED00405457 /* SDWebImageImageIOCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 321E60981F38E8ED00405457 /* SDWebImageImageIOCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60921F38E8ED00405457 /* SDWebImageImageIOCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 321E60991F38E8ED00405457 /* SDWebImageImageIOCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60921F38E8ED00405457 /* SDWebImageImageIOCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 321E609A1F38E8ED00405457 /* SDWebImageImageIOCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60931F38E8ED00405457 /* SDWebImageImageIOCoder.m */; }; - 321E609B1F38E8ED00405457 /* SDWebImageImageIOCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60931F38E8ED00405457 /* SDWebImageImageIOCoder.m */; }; - 321E609C1F38E8ED00405457 /* SDWebImageImageIOCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60931F38E8ED00405457 /* SDWebImageImageIOCoder.m */; }; - 321E609D1F38E8ED00405457 /* SDWebImageImageIOCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60931F38E8ED00405457 /* SDWebImageImageIOCoder.m */; }; - 321E609E1F38E8ED00405457 /* SDWebImageImageIOCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60931F38E8ED00405457 /* SDWebImageImageIOCoder.m */; }; - 321E609F1F38E8ED00405457 /* SDWebImageImageIOCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60931F38E8ED00405457 /* SDWebImageImageIOCoder.m */; }; - 321E60A21F38E8F600405457 /* SDWebImageGIFCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60A01F38E8F600405457 /* SDWebImageGIFCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 321E60A31F38E8F600405457 /* SDWebImageGIFCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60A01F38E8F600405457 /* SDWebImageGIFCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 321E60A41F38E8F600405457 /* SDWebImageGIFCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60A01F38E8F600405457 /* SDWebImageGIFCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 321E60A51F38E8F600405457 /* SDWebImageGIFCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60A01F38E8F600405457 /* SDWebImageGIFCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 321E60A61F38E8F600405457 /* SDWebImageGIFCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60A01F38E8F600405457 /* SDWebImageGIFCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 321E60A71F38E8F600405457 /* SDWebImageGIFCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60A01F38E8F600405457 /* SDWebImageGIFCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 321E60A81F38E8F600405457 /* SDWebImageGIFCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60A11F38E8F600405457 /* SDWebImageGIFCoder.m */; }; - 321E60A91F38E8F600405457 /* SDWebImageGIFCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60A11F38E8F600405457 /* SDWebImageGIFCoder.m */; }; - 321E60AA1F38E8F600405457 /* SDWebImageGIFCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60A11F38E8F600405457 /* SDWebImageGIFCoder.m */; }; - 321E60AB1F38E8F600405457 /* SDWebImageGIFCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60A11F38E8F600405457 /* SDWebImageGIFCoder.m */; }; - 321E60AC1F38E8F600405457 /* SDWebImageGIFCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60A11F38E8F600405457 /* SDWebImageGIFCoder.m */; }; - 321E60AD1F38E8F600405457 /* SDWebImageGIFCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60A11F38E8F600405457 /* SDWebImageGIFCoder.m */; }; + 321E60941F38E8ED00405457 /* SDImageIOCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60921F38E8ED00405457 /* SDImageIOCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 321E60951F38E8ED00405457 /* SDImageIOCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60921F38E8ED00405457 /* SDImageIOCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 321E60961F38E8ED00405457 /* SDImageIOCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60921F38E8ED00405457 /* SDImageIOCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 321E60971F38E8ED00405457 /* SDImageIOCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60921F38E8ED00405457 /* SDImageIOCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 321E60981F38E8ED00405457 /* SDImageIOCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60921F38E8ED00405457 /* SDImageIOCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 321E60991F38E8ED00405457 /* SDImageIOCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60921F38E8ED00405457 /* SDImageIOCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 321E609A1F38E8ED00405457 /* SDImageIOCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60931F38E8ED00405457 /* SDImageIOCoder.m */; }; + 321E609B1F38E8ED00405457 /* SDImageIOCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60931F38E8ED00405457 /* SDImageIOCoder.m */; }; + 321E609C1F38E8ED00405457 /* SDImageIOCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60931F38E8ED00405457 /* SDImageIOCoder.m */; }; + 321E609D1F38E8ED00405457 /* SDImageIOCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60931F38E8ED00405457 /* SDImageIOCoder.m */; }; + 321E609E1F38E8ED00405457 /* SDImageIOCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60931F38E8ED00405457 /* SDImageIOCoder.m */; }; + 321E609F1F38E8ED00405457 /* SDImageIOCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60931F38E8ED00405457 /* SDImageIOCoder.m */; }; + 321E60A21F38E8F600405457 /* SDImageGIFCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60A01F38E8F600405457 /* SDImageGIFCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 321E60A31F38E8F600405457 /* SDImageGIFCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60A01F38E8F600405457 /* SDImageGIFCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 321E60A41F38E8F600405457 /* SDImageGIFCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60A01F38E8F600405457 /* SDImageGIFCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 321E60A51F38E8F600405457 /* SDImageGIFCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60A01F38E8F600405457 /* SDImageGIFCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 321E60A61F38E8F600405457 /* SDImageGIFCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60A01F38E8F600405457 /* SDImageGIFCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 321E60A71F38E8F600405457 /* SDImageGIFCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60A01F38E8F600405457 /* SDImageGIFCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 321E60A81F38E8F600405457 /* SDImageGIFCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60A11F38E8F600405457 /* SDImageGIFCoder.m */; }; + 321E60A91F38E8F600405457 /* SDImageGIFCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60A11F38E8F600405457 /* SDImageGIFCoder.m */; }; + 321E60AA1F38E8F600405457 /* SDImageGIFCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60A11F38E8F600405457 /* SDImageGIFCoder.m */; }; + 321E60AB1F38E8F600405457 /* SDImageGIFCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60A11F38E8F600405457 /* SDImageGIFCoder.m */; }; + 321E60AC1F38E8F600405457 /* SDImageGIFCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60A11F38E8F600405457 /* SDImageGIFCoder.m */; }; + 321E60AD1F38E8F600405457 /* SDImageGIFCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 321E60A11F38E8F600405457 /* SDImageGIFCoder.m */; }; 321E60BE1F38E91700405457 /* UIImage+ForceDecode.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60BC1F38E91700405457 /* UIImage+ForceDecode.h */; settings = {ATTRIBUTES = (Public, ); }; }; 321E60BF1F38E91700405457 /* UIImage+ForceDecode.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60BC1F38E91700405457 /* UIImage+ForceDecode.h */; settings = {ATTRIBUTES = (Public, ); }; }; 321E60C01F38E91700405457 /* UIImage+ForceDecode.h in Headers */ = {isa = PBXBuildFile; fileRef = 321E60BC1F38E91700405457 /* UIImage+ForceDecode.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -398,18 +398,18 @@ 325312D1200F09910046BF1E /* SDWebImageTransition.m in Sources */ = {isa = PBXBuildFile; fileRef = 325312C7200F09910046BF1E /* SDWebImageTransition.m */; }; 325312D2200F09910046BF1E /* SDWebImageTransition.m in Sources */ = {isa = PBXBuildFile; fileRef = 325312C7200F09910046BF1E /* SDWebImageTransition.m */; }; 325312D3200F09910046BF1E /* SDWebImageTransition.m in Sources */ = {isa = PBXBuildFile; fileRef = 325312C7200F09910046BF1E /* SDWebImageTransition.m */; }; - 327054D4206CD8B3006EA328 /* SDWebImageAPNGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 327054D2206CD8B3006EA328 /* SDWebImageAPNGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 327054D5206CD8B3006EA328 /* SDWebImageAPNGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 327054D2206CD8B3006EA328 /* SDWebImageAPNGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 327054D6206CD8B3006EA328 /* SDWebImageAPNGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 327054D2206CD8B3006EA328 /* SDWebImageAPNGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 327054D7206CD8B3006EA328 /* SDWebImageAPNGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 327054D2206CD8B3006EA328 /* SDWebImageAPNGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 327054D8206CD8B3006EA328 /* SDWebImageAPNGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 327054D2206CD8B3006EA328 /* SDWebImageAPNGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 327054D9206CD8B3006EA328 /* SDWebImageAPNGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 327054D2206CD8B3006EA328 /* SDWebImageAPNGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 327054DA206CD8B3006EA328 /* SDWebImageAPNGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 327054D3206CD8B3006EA328 /* SDWebImageAPNGCoder.m */; }; - 327054DB206CD8B3006EA328 /* SDWebImageAPNGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 327054D3206CD8B3006EA328 /* SDWebImageAPNGCoder.m */; }; - 327054DC206CD8B3006EA328 /* SDWebImageAPNGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 327054D3206CD8B3006EA328 /* SDWebImageAPNGCoder.m */; }; - 327054DD206CD8B3006EA328 /* SDWebImageAPNGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 327054D3206CD8B3006EA328 /* SDWebImageAPNGCoder.m */; }; - 327054DE206CD8B3006EA328 /* SDWebImageAPNGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 327054D3206CD8B3006EA328 /* SDWebImageAPNGCoder.m */; }; - 327054DF206CD8B3006EA328 /* SDWebImageAPNGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 327054D3206CD8B3006EA328 /* SDWebImageAPNGCoder.m */; }; + 327054D4206CD8B3006EA328 /* SDImageAPNGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 327054D2206CD8B3006EA328 /* SDImageAPNGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 327054D5206CD8B3006EA328 /* SDImageAPNGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 327054D2206CD8B3006EA328 /* SDImageAPNGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 327054D6206CD8B3006EA328 /* SDImageAPNGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 327054D2206CD8B3006EA328 /* SDImageAPNGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 327054D7206CD8B3006EA328 /* SDImageAPNGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 327054D2206CD8B3006EA328 /* SDImageAPNGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 327054D8206CD8B3006EA328 /* SDImageAPNGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 327054D2206CD8B3006EA328 /* SDImageAPNGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 327054D9206CD8B3006EA328 /* SDImageAPNGCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 327054D2206CD8B3006EA328 /* SDImageAPNGCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 327054DA206CD8B3006EA328 /* SDImageAPNGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 327054D3206CD8B3006EA328 /* SDImageAPNGCoder.m */; }; + 327054DB206CD8B3006EA328 /* SDImageAPNGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 327054D3206CD8B3006EA328 /* SDImageAPNGCoder.m */; }; + 327054DC206CD8B3006EA328 /* SDImageAPNGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 327054D3206CD8B3006EA328 /* SDImageAPNGCoder.m */; }; + 327054DD206CD8B3006EA328 /* SDImageAPNGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 327054D3206CD8B3006EA328 /* SDImageAPNGCoder.m */; }; + 327054DE206CD8B3006EA328 /* SDImageAPNGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 327054D3206CD8B3006EA328 /* SDImageAPNGCoder.m */; }; + 327054DF206CD8B3006EA328 /* SDImageAPNGCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 327054D3206CD8B3006EA328 /* SDImageAPNGCoder.m */; }; 328BB69C2081FED200760D6C /* SDWebImageCacheKeyFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 328BB69A2081FED200760D6C /* SDWebImageCacheKeyFilter.h */; settings = {ATTRIBUTES = (Public, ); }; }; 328BB69D2081FED200760D6C /* SDWebImageCacheKeyFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 328BB69A2081FED200760D6C /* SDWebImageCacheKeyFilter.h */; settings = {ATTRIBUTES = (Public, ); }; }; 328BB69E2081FED200760D6C /* SDWebImageCacheKeyFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 328BB69A2081FED200760D6C /* SDWebImageCacheKeyFilter.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -597,24 +597,24 @@ 32FDE88C20888726008D7530 /* UIImage+WebP.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FDE88520888726008D7530 /* UIImage+WebP.m */; }; 32FDE88D20888726008D7530 /* UIImage+WebP.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FDE88520888726008D7530 /* UIImage+WebP.m */; }; 32FDE88E20888726008D7530 /* UIImage+WebP.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FDE88520888726008D7530 /* UIImage+WebP.m */; }; - 32FDE88F20888726008D7530 /* SDWebImageWebPCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE88620888726008D7530 /* SDWebImageWebPCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 32FDE89020888726008D7530 /* SDWebImageWebPCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE88620888726008D7530 /* SDWebImageWebPCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 32FDE89120888726008D7530 /* SDWebImageWebPCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE88620888726008D7530 /* SDWebImageWebPCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 32FDE89220888726008D7530 /* SDWebImageWebPCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE88620888726008D7530 /* SDWebImageWebPCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 32FDE89320888726008D7530 /* SDWebImageWebPCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE88620888726008D7530 /* SDWebImageWebPCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 32FDE89420888726008D7530 /* SDWebImageWebPCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE88620888726008D7530 /* SDWebImageWebPCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 32FDE88F20888726008D7530 /* SDImageWebPCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE88620888726008D7530 /* SDImageWebPCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 32FDE89020888726008D7530 /* SDImageWebPCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE88620888726008D7530 /* SDImageWebPCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 32FDE89120888726008D7530 /* SDImageWebPCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE88620888726008D7530 /* SDImageWebPCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 32FDE89220888726008D7530 /* SDImageWebPCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE88620888726008D7530 /* SDImageWebPCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 32FDE89320888726008D7530 /* SDImageWebPCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE88620888726008D7530 /* SDImageWebPCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 32FDE89420888726008D7530 /* SDImageWebPCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE88620888726008D7530 /* SDImageWebPCoder.h */; settings = {ATTRIBUTES = (Public, ); }; }; 32FDE89520888726008D7530 /* UIImage+WebP.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE88720888726008D7530 /* UIImage+WebP.h */; settings = {ATTRIBUTES = (Public, ); }; }; 32FDE89620888726008D7530 /* UIImage+WebP.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE88720888726008D7530 /* UIImage+WebP.h */; settings = {ATTRIBUTES = (Public, ); }; }; 32FDE89720888726008D7530 /* UIImage+WebP.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE88720888726008D7530 /* UIImage+WebP.h */; settings = {ATTRIBUTES = (Public, ); }; }; 32FDE89820888726008D7530 /* UIImage+WebP.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE88720888726008D7530 /* UIImage+WebP.h */; settings = {ATTRIBUTES = (Public, ); }; }; 32FDE89920888726008D7530 /* UIImage+WebP.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE88720888726008D7530 /* UIImage+WebP.h */; settings = {ATTRIBUTES = (Public, ); }; }; 32FDE89A20888726008D7530 /* UIImage+WebP.h in Headers */ = {isa = PBXBuildFile; fileRef = 32FDE88720888726008D7530 /* UIImage+WebP.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 32FDE89B20888726008D7530 /* SDWebImageWebPCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FDE88820888726008D7530 /* SDWebImageWebPCoder.m */; }; - 32FDE89C20888726008D7530 /* SDWebImageWebPCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FDE88820888726008D7530 /* SDWebImageWebPCoder.m */; }; - 32FDE89D20888726008D7530 /* SDWebImageWebPCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FDE88820888726008D7530 /* SDWebImageWebPCoder.m */; }; - 32FDE89E20888726008D7530 /* SDWebImageWebPCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FDE88820888726008D7530 /* SDWebImageWebPCoder.m */; }; - 32FDE89F20888726008D7530 /* SDWebImageWebPCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FDE88820888726008D7530 /* SDWebImageWebPCoder.m */; }; - 32FDE8A020888726008D7530 /* SDWebImageWebPCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FDE88820888726008D7530 /* SDWebImageWebPCoder.m */; }; + 32FDE89B20888726008D7530 /* SDImageWebPCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FDE88820888726008D7530 /* SDImageWebPCoder.m */; }; + 32FDE89C20888726008D7530 /* SDImageWebPCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FDE88820888726008D7530 /* SDImageWebPCoder.m */; }; + 32FDE89D20888726008D7530 /* SDImageWebPCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FDE88820888726008D7530 /* SDImageWebPCoder.m */; }; + 32FDE89E20888726008D7530 /* SDImageWebPCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FDE88820888726008D7530 /* SDImageWebPCoder.m */; }; + 32FDE89F20888726008D7530 /* SDImageWebPCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FDE88820888726008D7530 /* SDImageWebPCoder.m */; }; + 32FDE8A020888726008D7530 /* SDImageWebPCoder.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FDE88820888726008D7530 /* SDImageWebPCoder.m */; }; 32FDE8A220888789008D7530 /* SDWebImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A2CAE031AB4BB5400B6BC39 /* SDWebImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; 32FDE8A320888789008D7530 /* SDWebImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A2CAE031AB4BB5400B6BC39 /* SDWebImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4314D1231D0E0E3B004B36C9 /* SDImageCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 53922D86148C56230056699D /* SDImageCache.m */; }; @@ -1519,18 +1519,18 @@ 80377EE41F2F66D500F89830 /* vp8li_dec.h in Headers */ = {isa = PBXBuildFile; fileRef = 80377E841F2F66D000F89830 /* vp8li_dec.h */; }; 80377EE51F2F66D500F89830 /* webp_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 80377E851F2F66D000F89830 /* webp_dec.c */; }; 80377EE61F2F66D500F89830 /* webpi_dec.h in Headers */ = {isa = PBXBuildFile; fileRef = 80377E861F2F66D000F89830 /* webpi_dec.h */; }; - 807A12281F89636300EC2A9B /* SDWebImageCodersManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 807A12261F89636300EC2A9B /* SDWebImageCodersManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 807A12291F89636300EC2A9B /* SDWebImageCodersManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 807A12261F89636300EC2A9B /* SDWebImageCodersManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 807A122A1F89636300EC2A9B /* SDWebImageCodersManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 807A12261F89636300EC2A9B /* SDWebImageCodersManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 807A122B1F89636300EC2A9B /* SDWebImageCodersManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 807A12261F89636300EC2A9B /* SDWebImageCodersManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 807A122C1F89636300EC2A9B /* SDWebImageCodersManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 807A12261F89636300EC2A9B /* SDWebImageCodersManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 807A122D1F89636300EC2A9B /* SDWebImageCodersManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 807A12261F89636300EC2A9B /* SDWebImageCodersManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 807A122E1F89636300EC2A9B /* SDWebImageCodersManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 807A12271F89636300EC2A9B /* SDWebImageCodersManager.m */; }; - 807A122F1F89636300EC2A9B /* SDWebImageCodersManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 807A12271F89636300EC2A9B /* SDWebImageCodersManager.m */; }; - 807A12301F89636300EC2A9B /* SDWebImageCodersManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 807A12271F89636300EC2A9B /* SDWebImageCodersManager.m */; }; - 807A12311F89636300EC2A9B /* SDWebImageCodersManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 807A12271F89636300EC2A9B /* SDWebImageCodersManager.m */; }; - 807A12321F89636300EC2A9B /* SDWebImageCodersManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 807A12271F89636300EC2A9B /* SDWebImageCodersManager.m */; }; - 807A12331F89636300EC2A9B /* SDWebImageCodersManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 807A12271F89636300EC2A9B /* SDWebImageCodersManager.m */; }; + 807A12281F89636300EC2A9B /* SDImageCodersManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 807A12261F89636300EC2A9B /* SDImageCodersManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 807A12291F89636300EC2A9B /* SDImageCodersManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 807A12261F89636300EC2A9B /* SDImageCodersManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 807A122A1F89636300EC2A9B /* SDImageCodersManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 807A12261F89636300EC2A9B /* SDImageCodersManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 807A122B1F89636300EC2A9B /* SDImageCodersManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 807A12261F89636300EC2A9B /* SDImageCodersManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 807A122C1F89636300EC2A9B /* SDImageCodersManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 807A12261F89636300EC2A9B /* SDImageCodersManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 807A122D1F89636300EC2A9B /* SDImageCodersManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 807A12261F89636300EC2A9B /* SDImageCodersManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 807A122E1F89636300EC2A9B /* SDImageCodersManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 807A12271F89636300EC2A9B /* SDImageCodersManager.m */; }; + 807A122F1F89636300EC2A9B /* SDImageCodersManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 807A12271F89636300EC2A9B /* SDImageCodersManager.m */; }; + 807A12301F89636300EC2A9B /* SDImageCodersManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 807A12271F89636300EC2A9B /* SDImageCodersManager.m */; }; + 807A12311F89636300EC2A9B /* SDImageCodersManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 807A12271F89636300EC2A9B /* SDImageCodersManager.m */; }; + 807A12321F89636300EC2A9B /* SDImageCodersManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 807A12271F89636300EC2A9B /* SDImageCodersManager.m */; }; + 807A12331F89636300EC2A9B /* SDImageCodersManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 807A12271F89636300EC2A9B /* SDImageCodersManager.m */; }; A18A6CC7172DC28500419892 /* UIImage+GIF.h in Headers */ = {isa = PBXBuildFile; fileRef = A18A6CC5172DC28500419892 /* UIImage+GIF.h */; settings = {ATTRIBUTES = (Public, ); }; }; A18A6CC9172DC28500419892 /* UIImage+GIF.m in Sources */ = {isa = PBXBuildFile; fileRef = A18A6CC6172DC28500419892 /* UIImage+GIF.m */; }; AB615303192DA24600A2D8E9 /* UIView+WebCacheOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = AB615301192DA24600A2D8E9 /* UIView+WebCacheOperation.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -1553,10 +1553,10 @@ 321DB3602011D4D60015D2CB /* NSButton+WebCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSButton+WebCache.m"; path = "SDWebImage/NSButton+WebCache.m"; sourceTree = ""; }; 321E60841F38E8C800405457 /* SDImageCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDImageCoder.h; sourceTree = ""; }; 321E60851F38E8C800405457 /* SDImageCoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDImageCoder.m; sourceTree = ""; }; - 321E60921F38E8ED00405457 /* SDWebImageImageIOCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDWebImageImageIOCoder.h; sourceTree = ""; }; - 321E60931F38E8ED00405457 /* SDWebImageImageIOCoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDWebImageImageIOCoder.m; sourceTree = ""; }; - 321E60A01F38E8F600405457 /* SDWebImageGIFCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDWebImageGIFCoder.h; sourceTree = ""; }; - 321E60A11F38E8F600405457 /* SDWebImageGIFCoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDWebImageGIFCoder.m; sourceTree = ""; }; + 321E60921F38E8ED00405457 /* SDImageIOCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDImageIOCoder.h; sourceTree = ""; }; + 321E60931F38E8ED00405457 /* SDImageIOCoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDImageIOCoder.m; sourceTree = ""; }; + 321E60A01F38E8F600405457 /* SDImageGIFCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDImageGIFCoder.h; sourceTree = ""; }; + 321E60A11F38E8F600405457 /* SDImageGIFCoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDImageGIFCoder.m; sourceTree = ""; }; 321E60BC1F38E91700405457 /* UIImage+ForceDecode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+ForceDecode.h"; sourceTree = ""; }; 321E60BD1F38E91700405457 /* UIImage+ForceDecode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+ForceDecode.m"; sourceTree = ""; }; 323F8B131F38EF770092B609 /* alpha_enc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = alpha_enc.c; sourceTree = ""; }; @@ -1604,8 +1604,8 @@ 324DF4B3200A14DC008A84CC /* SDWebImageDefine.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDWebImageDefine.m; sourceTree = ""; }; 325312C6200F09910046BF1E /* SDWebImageTransition.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDWebImageTransition.h; sourceTree = ""; }; 325312C7200F09910046BF1E /* SDWebImageTransition.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDWebImageTransition.m; sourceTree = ""; }; - 327054D2206CD8B3006EA328 /* SDWebImageAPNGCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDWebImageAPNGCoder.h; sourceTree = ""; }; - 327054D3206CD8B3006EA328 /* SDWebImageAPNGCoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDWebImageAPNGCoder.m; sourceTree = ""; }; + 327054D2206CD8B3006EA328 /* SDImageAPNGCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDImageAPNGCoder.h; sourceTree = ""; }; + 327054D3206CD8B3006EA328 /* SDImageAPNGCoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDImageAPNGCoder.m; sourceTree = ""; }; 328BB69A2081FED200760D6C /* SDWebImageCacheKeyFilter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDWebImageCacheKeyFilter.h; sourceTree = ""; }; 328BB69B2081FED200760D6C /* SDWebImageCacheKeyFilter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDWebImageCacheKeyFilter.m; sourceTree = ""; }; 328BB6A82081FEE500760D6C /* SDWebImageCacheSerializer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDWebImageCacheSerializer.h; sourceTree = ""; }; @@ -1637,9 +1637,9 @@ 32FDE87A2088871B008D7530 /* MKAnnotationView+WebCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MKAnnotationView+WebCache.m"; sourceTree = ""; }; 32FDE87B2088871B008D7530 /* MKAnnotationView+WebCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MKAnnotationView+WebCache.h"; sourceTree = ""; }; 32FDE88520888726008D7530 /* UIImage+WebP.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+WebP.m"; sourceTree = ""; }; - 32FDE88620888726008D7530 /* SDWebImageWebPCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDWebImageWebPCoder.h; sourceTree = ""; }; + 32FDE88620888726008D7530 /* SDImageWebPCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDImageWebPCoder.h; sourceTree = ""; }; 32FDE88720888726008D7530 /* UIImage+WebP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+WebP.h"; sourceTree = ""; }; - 32FDE88820888726008D7530 /* SDWebImageWebPCoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDWebImageWebPCoder.m; sourceTree = ""; }; + 32FDE88820888726008D7530 /* SDImageWebPCoder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDImageWebPCoder.m; sourceTree = ""; }; 32FDE8A4208887A6008D7530 /* SDWebImage.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = SDWebImage.modulemap; sourceTree = ""; }; 4314D1991D0E0E3B004B36C9 /* libSDWebImage watchOS static.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libSDWebImage watchOS static.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 431BB7031D06D2C1006A3455 /* SDWebImage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDWebImage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1797,8 +1797,8 @@ 80377E841F2F66D000F89830 /* vp8li_dec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vp8li_dec.h; sourceTree = ""; }; 80377E851F2F66D000F89830 /* webp_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = webp_dec.c; sourceTree = ""; }; 80377E861F2F66D000F89830 /* webpi_dec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = webpi_dec.h; sourceTree = ""; }; - 807A12261F89636300EC2A9B /* SDWebImageCodersManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDWebImageCodersManager.h; sourceTree = ""; }; - 807A12271F89636300EC2A9B /* SDWebImageCodersManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDWebImageCodersManager.m; sourceTree = ""; }; + 807A12261F89636300EC2A9B /* SDImageCodersManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDImageCodersManager.h; sourceTree = ""; }; + 807A12271F89636300EC2A9B /* SDImageCodersManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDImageCodersManager.m; sourceTree = ""; }; A18A6CC5172DC28500419892 /* UIImage+GIF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+GIF.h"; sourceTree = ""; }; A18A6CC6172DC28500419892 /* UIImage+GIF.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+GIF.m"; sourceTree = ""; }; AB615301192DA24600A2D8E9 /* UIView+WebCacheOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIView+WebCacheOperation.h"; sourceTree = ""; }; @@ -1869,16 +1869,16 @@ 321E60831F38E88F00405457 /* Decoder */ = { isa = PBXGroup; children = ( - 807A12261F89636300EC2A9B /* SDWebImageCodersManager.h */, - 807A12271F89636300EC2A9B /* SDWebImageCodersManager.m */, + 807A12261F89636300EC2A9B /* SDImageCodersManager.h */, + 807A12271F89636300EC2A9B /* SDImageCodersManager.m */, 321E60841F38E8C800405457 /* SDImageCoder.h */, 321E60851F38E8C800405457 /* SDImageCoder.m */, - 321E60921F38E8ED00405457 /* SDWebImageImageIOCoder.h */, - 321E60931F38E8ED00405457 /* SDWebImageImageIOCoder.m */, - 321E60A01F38E8F600405457 /* SDWebImageGIFCoder.h */, - 321E60A11F38E8F600405457 /* SDWebImageGIFCoder.m */, - 327054D2206CD8B3006EA328 /* SDWebImageAPNGCoder.h */, - 327054D3206CD8B3006EA328 /* SDWebImageAPNGCoder.m */, + 321E60921F38E8ED00405457 /* SDImageIOCoder.h */, + 321E60931F38E8ED00405457 /* SDImageIOCoder.m */, + 321E60A01F38E8F600405457 /* SDImageGIFCoder.h */, + 321E60A11F38E8F600405457 /* SDImageGIFCoder.m */, + 327054D2206CD8B3006EA328 /* SDImageAPNGCoder.h */, + 327054D3206CD8B3006EA328 /* SDImageAPNGCoder.m */, 3290FA021FA478AF0047D20C /* SDWebImageFrame.h */, 3290FA031FA478AF0047D20C /* SDWebImageFrame.m */, 32CF1C051FA496B000004BD1 /* SDWebImageCoderHelper.h */, @@ -1996,8 +1996,8 @@ children = ( 32FDE88720888726008D7530 /* UIImage+WebP.h */, 32FDE88520888726008D7530 /* UIImage+WebP.m */, - 32FDE88620888726008D7530 /* SDWebImageWebPCoder.h */, - 32FDE88820888726008D7530 /* SDWebImageWebPCoder.m */, + 32FDE88620888726008D7530 /* SDImageWebPCoder.h */, + 32FDE88820888726008D7530 /* SDImageWebPCoder.m */, ); path = WebP; sourceTree = ""; @@ -2404,14 +2404,14 @@ 4369C27A1D9807EC007E863A /* UIView+WebCache.h in Headers */, 32F21B5420788D8C0036B1D5 /* SDWebImageDownloaderRequestModifier.h in Headers */, 80377DCC1F2F66A700F89830 /* lossless_common.h in Headers */, - 321E60971F38E8ED00405457 /* SDWebImageImageIOCoder.h in Headers */, + 321E60971F38E8ED00405457 /* SDImageIOCoder.h in Headers */, 43A918671D8308FE00B3925F /* SDImageCacheConfig.h in Headers */, - 327054D7206CD8B3006EA328 /* SDWebImageAPNGCoder.h in Headers */, + 327054D7206CD8B3006EA328 /* SDImageAPNGCoder.h in Headers */, 431739571CDFC8B70008FEB9 /* encode.h in Headers */, 323F8B711F38EF770092B609 /* delta_palettization_enc.h in Headers */, 3290FA071FA478AF0047D20C /* SDWebImageFrame.h in Headers */, 324DF4B7200A14DC008A84CC /* SDWebImageDefine.h in Headers */, - 807A122B1F89636300EC2A9B /* SDWebImageCodersManager.h in Headers */, + 807A122B1F89636300EC2A9B /* SDImageCodersManager.h in Headers */, 80377EC61F2F66D500F89830 /* webpi_dec.h in Headers */, 80377C591F2F666300F89830 /* random_utils.h in Headers */, 80377DD91F2F66A700F89830 /* lossless.h in Headers */, @@ -2432,7 +2432,7 @@ 00733A701BC4880E00A5A117 /* UIImageView+HighlightedWebCache.h in Headers */, 323F8BDB1F38EF770092B609 /* vp8i_enc.h in Headers */, 80377C461F2F666300F89830 /* bit_reader_inl_utils.h in Headers */, - 32FDE89220888726008D7530 /* SDWebImageWebPCoder.h in Headers */, + 32FDE89220888726008D7530 /* SDImageWebPCoder.h in Headers */, 00733A671BC4880E00A5A117 /* SDImageCache.h in Headers */, 00733A711BC4880E00A5A117 /* UIImageView+WebCache.h in Headers */, 00733A631BC4880E00A5A117 /* SDWebImageCompat.h in Headers */, @@ -2452,7 +2452,7 @@ 00733A6A1BC4880E00A5A117 /* SDWebImagePrefetcher.h in Headers */, 00733A641BC4880E00A5A117 /* SDWebImageOperation.h in Headers */, 32484766201775F600AF9E5A /* SDAnimatedImageView+WebCache.h in Headers */, - 321E60A51F38E8F600405457 /* SDWebImageGIFCoder.h in Headers */, + 321E60A51F38E8F600405457 /* SDImageGIFCoder.h in Headers */, 32CF1C0A1FA496B000004BD1 /* SDWebImageCoderHelper.h in Headers */, 80377C4D1F2F666300F89830 /* endian_inl_utils.h in Headers */, 431739581CDFC8B70008FEB9 /* format_constants.h in Headers */, @@ -2494,15 +2494,15 @@ 80377C1D1F2F666300F89830 /* huffman_encode_utils.h in Headers */, 80377E9A1F2F66D400F89830 /* common_dec.h in Headers */, 32D1221F2080B2EB003685A3 /* SDImageCacheDefine.h in Headers */, - 327054D5206CD8B3006EA328 /* SDWebImageAPNGCoder.h in Headers */, + 327054D5206CD8B3006EA328 /* SDImageAPNGCoder.h in Headers */, 328BB6AB2081FEE500760D6C /* SDWebImageCacheSerializer.h in Headers */, 32B9B538206ED4230026769D /* SDWebImageDownloaderConfig.h in Headers */, 80377C231F2F666300F89830 /* quant_levels_utils.h in Headers */, 321E60BF1F38E91700405457 /* UIImage+ForceDecode.h in Headers */, 80377EA61F2F66D400F89830 /* webpi_dec.h in Headers */, - 807A12291F89636300EC2A9B /* SDWebImageCodersManager.h in Headers */, + 807A12291F89636300EC2A9B /* SDImageCodersManager.h in Headers */, 32F7C0852030719600873181 /* UIImage+Transform.h in Headers */, - 32FDE89020888726008D7530 /* SDWebImageWebPCoder.h in Headers */, + 32FDE89020888726008D7530 /* SDImageWebPCoder.h in Headers */, 80377C141F2F666300F89830 /* bit_reader_utils.h in Headers */, 328BB69D2081FED200760D6C /* SDWebImageCacheKeyFilter.h in Headers */, 323F8C0F1F38EF770092B609 /* muxi.h in Headers */, @@ -2525,7 +2525,7 @@ 80377EA21F2F66D400F89830 /* vp8i_dec.h in Headers */, 320CAE162086F50500CFFC80 /* SDWebImageError.h in Headers */, 3248476A201775F600AF9E5A /* SDAnimatedImageView.h in Headers */, - 321E60951F38E8ED00405457 /* SDWebImageImageIOCoder.h in Headers */, + 321E60951F38E8ED00405457 /* SDImageIOCoder.h in Headers */, 80377C211F2F666300F89830 /* quant_levels_dec_utils.h in Headers */, 4314D1721D0E0E3B004B36C9 /* SDWebImageCompat.h in Headers */, 32484776201775F600AF9E5A /* SDAnimatedImage.h in Headers */, @@ -2551,7 +2551,7 @@ 323F8BE51F38EF770092B609 /* vp8li_enc.h in Headers */, 324DF4B5200A14DC008A84CC /* SDWebImageDefine.h in Headers */, 80377C191F2F666300F89830 /* endian_inl_utils.h in Headers */, - 321E60A31F38E8F600405457 /* SDWebImageGIFCoder.h in Headers */, + 321E60A31F38E8F600405457 /* SDImageGIFCoder.h in Headers */, 32FDE8A320888789008D7530 /* SDWebImage.h in Headers */, 32F21B5220788D8C0036B1D5 /* SDWebImageDownloaderRequestModifier.h in Headers */, 4369C2781D9807EC007E863A /* UIView+WebCache.h in Headers */, @@ -2618,7 +2618,7 @@ 80377E031F2F66A800F89830 /* dsp.h in Headers */, 80377C661F2F666400F89830 /* color_cache_utils.h in Headers */, 3290FA081FA478AF0047D20C /* SDWebImageFrame.h in Headers */, - 321E60A61F38E8F600405457 /* SDWebImageGIFCoder.h in Headers */, + 321E60A61F38E8F600405457 /* SDImageGIFCoder.h in Headers */, 431BB6E71D06D2C1006A3455 /* SDWebImageCompat.h in Headers */, 80377E211F2F66A800F89830 /* neon.h in Headers */, 80377C711F2F666400F89830 /* quant_levels_utils.h in Headers */, @@ -2642,10 +2642,10 @@ 32C0FDE52013426C001B8F2D /* SDWebImageIndicator.h in Headers */, 80377ED61F2F66D500F89830 /* webpi_dec.h in Headers */, 323F8BE81F38EF770092B609 /* vp8li_enc.h in Headers */, - 32FDE89320888726008D7530 /* SDWebImageWebPCoder.h in Headers */, + 32FDE89320888726008D7530 /* SDImageWebPCoder.h in Headers */, 323F8B8A1F38EF770092B609 /* histogram_enc.h in Headers */, 80377E1E1F2F66A800F89830 /* lossless.h in Headers */, - 321E60981F38E8ED00405457 /* SDWebImageImageIOCoder.h in Headers */, + 321E60981F38E8ED00405457 /* SDImageIOCoder.h in Headers */, 328BB6D12082581100760D6C /* SDMemoryCache.h in Headers */, 4369C27B1D9807EC007E863A /* UIView+WebCache.h in Headers */, 80377ED11F2F66D500F89830 /* vp8_dec.h in Headers */, @@ -2662,7 +2662,7 @@ 431BB6F61D06D2C1006A3455 /* UIImage+MultiFormat.h in Headers */, 320CAE192086F50500CFFC80 /* SDWebImageError.h in Headers */, 32F21B5520788D8C0036B1D5 /* SDWebImageDownloaderRequestModifier.h in Headers */, - 807A122C1F89636300EC2A9B /* SDWebImageCodersManager.h in Headers */, + 807A122C1F89636300EC2A9B /* SDImageCodersManager.h in Headers */, 323F8BFA1F38EF770092B609 /* animi.h in Headers */, 431BB6F91D06D2C1006A3455 /* UIImage+GIF.h in Headers */, 32F7C0732030114C00873181 /* SDWebImageTransformer.h in Headers */, @@ -2673,7 +2673,7 @@ 323F8BDC1F38EF770092B609 /* vp8i_enc.h in Headers */, 80377ED21F2F66D500F89830 /* vp8i_dec.h in Headers */, 32484779201775F600AF9E5A /* SDAnimatedImage.h in Headers */, - 327054D8206CD8B3006EA328 /* SDWebImageAPNGCoder.h in Headers */, + 327054D8206CD8B3006EA328 /* SDImageAPNGCoder.h in Headers */, 43A918681D8308FE00B3925F /* SDImageCacheConfig.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -2684,7 +2684,7 @@ files = ( 80377C7E1F2F666400F89830 /* bit_writer_utils.h in Headers */, 80377ED81F2F66D500F89830 /* alphai_dec.h in Headers */, - 321E60A71F38E8F600405457 /* SDWebImageGIFCoder.h in Headers */, + 321E60A71F38E8F600405457 /* SDImageGIFCoder.h in Headers */, 324DF4B9200A14DC008A84CC /* SDWebImageDefine.h in Headers */, 32F7C0892030719600873181 /* UIImage+Transform.h in Headers */, 80377EDA1F2F66D500F89830 /* common_dec.h in Headers */, @@ -2702,9 +2702,9 @@ 80377C8D1F2F666400F89830 /* random_utils.h in Headers */, 4397D2C31D0DDD8C00BB2784 /* SDWebImageManager.h in Headers */, 323F8B551F38EF770092B609 /* backward_references_enc.h in Headers */, - 327054D9206CD8B3006EA328 /* SDWebImageAPNGCoder.h in Headers */, + 327054D9206CD8B3006EA328 /* SDImageAPNGCoder.h in Headers */, 80377C811F2F666400F89830 /* endian_inl_utils.h in Headers */, - 321E60991F38E8ED00405457 /* SDWebImageImageIOCoder.h in Headers */, + 321E60991F38E8ED00405457 /* SDImageIOCoder.h in Headers */, 323F8B8B1F38EF770092B609 /* histogram_enc.h in Headers */, 4397D2C41D0DDD8C00BB2784 /* SDImageCache.h in Headers */, 3248476E201775F600AF9E5A /* SDAnimatedImageView.h in Headers */, @@ -2727,7 +2727,7 @@ 329A185E1FFF5DFD008C9A2F /* UIImage+WebCache.h in Headers */, 320224BB203979BA00E9F285 /* SDAnimatedImageRep.h in Headers */, 328BB6C62082581100760D6C /* SDDiskCache.h in Headers */, - 32FDE89420888726008D7530 /* SDWebImageWebPCoder.h in Headers */, + 32FDE89420888726008D7530 /* SDImageWebPCoder.h in Headers */, 80377E761F2F66A800F89830 /* yuv.h in Headers */, 80377C7A1F2F666400F89830 /* bit_reader_inl_utils.h in Headers */, 80377E631F2F66A800F89830 /* lossless.h in Headers */, @@ -2771,7 +2771,7 @@ 4397D2EB1D0DDD8C00BB2784 /* NSData+ImageContentType.h in Headers */, 80377C851F2F666400F89830 /* huffman_encode_utils.h in Headers */, 321DB3612011D4D70015D2CB /* NSButton+WebCache.h in Headers */, - 807A122D1F89636300EC2A9B /* SDWebImageCodersManager.h in Headers */, + 807A122D1F89636300EC2A9B /* SDImageCodersManager.h in Headers */, 4397D2ED1D0DDD8C00BB2784 /* mux_types.h in Headers */, 80377C831F2F666400F89830 /* filters_utils.h in Headers */, 80377E651F2F66A800F89830 /* msa_macro.h in Headers */, @@ -2801,15 +2801,15 @@ 4369C2791D9807EC007E863A /* UIView+WebCache.h in Headers */, 32F21B5320788D8C0036B1D5 /* SDWebImageDownloaderRequestModifier.h in Headers */, 80377D871F2F66A700F89830 /* lossless_common.h in Headers */, - 321E60961F38E8ED00405457 /* SDWebImageImageIOCoder.h in Headers */, + 321E60961F38E8ED00405457 /* SDImageIOCoder.h in Headers */, 4A2CAE041AB4BB5400B6BC39 /* SDWebImage.h in Headers */, - 327054D6206CD8B3006EA328 /* SDWebImageAPNGCoder.h in Headers */, + 327054D6206CD8B3006EA328 /* SDImageAPNGCoder.h in Headers */, 431739511CDFC8B70008FEB9 /* format_constants.h in Headers */, 43A918661D8308FE00B3925F /* SDImageCacheConfig.h in Headers */, 323F8B701F38EF770092B609 /* delta_palettization_enc.h in Headers */, 3290FA061FA478AF0047D20C /* SDWebImageFrame.h in Headers */, 324DF4B6200A14DC008A84CC /* SDWebImageDefine.h in Headers */, - 807A122A1F89636300EC2A9B /* SDWebImageCodersManager.h in Headers */, + 807A122A1F89636300EC2A9B /* SDImageCodersManager.h in Headers */, 80377EB61F2F66D400F89830 /* webpi_dec.h in Headers */, 4A2CAE211AB4BB7000B6BC39 /* SDWebImageManager.h in Headers */, 80377D941F2F66A700F89830 /* lossless.h in Headers */, @@ -2828,7 +2828,7 @@ 323F8B641F38EF770092B609 /* cost_enc.h in Headers */, 328BB6C32082581100760D6C /* SDDiskCache.h in Headers */, 4A2CAE1D1AB4BB6800B6BC39 /* SDWebImageDownloaderOperation.h in Headers */, - 32FDE89120888726008D7530 /* SDWebImageWebPCoder.h in Headers */, + 32FDE89120888726008D7530 /* SDImageWebPCoder.h in Headers */, 323F8BDA1F38EF770092B609 /* vp8i_enc.h in Headers */, 4317394E1CDFC8B70008FEB9 /* decode.h in Headers */, 80377C2C1F2F666300F89830 /* bit_reader_inl_utils.h in Headers */, @@ -2850,7 +2850,7 @@ 4A2CAE1A1AB4BB6400B6BC39 /* SDWebImageOperation.h in Headers */, 80377C331F2F666300F89830 /* endian_inl_utils.h in Headers */, 32484765201775F600AF9E5A /* SDAnimatedImageView+WebCache.h in Headers */, - 321E60A41F38E8F600405457 /* SDWebImageGIFCoder.h in Headers */, + 321E60A41F38E8F600405457 /* SDImageGIFCoder.h in Headers */, 32CF1C091FA496B000004BD1 /* SDWebImageCoderHelper.h in Headers */, 4A2CAE1B1AB4BB6800B6BC39 /* SDWebImageDownloader.h in Headers */, 431739501CDFC8B70008FEB9 /* encode.h in Headers */, @@ -2894,7 +2894,7 @@ 323F8C0E1F38EF770092B609 /* muxi.h in Headers */, 325312C8200F09910046BF1E /* SDWebImageTransition.h in Headers */, 32C0FDE12013426C001B8F2D /* SDWebImageIndicator.h in Headers */, - 321E60A21F38E8F600405457 /* SDWebImageGIFCoder.h in Headers */, + 321E60A21F38E8F600405457 /* SDImageGIFCoder.h in Headers */, 5D5B9142188EE8DD006D06BD /* NSData+ImageContentType.h in Headers */, 80377BFE1F2F665300F89830 /* color_cache_utils.h in Headers */, 328BB6C12082581100760D6C /* SDDiskCache.h in Headers */, @@ -2907,12 +2907,12 @@ 3290FA041FA478AF0047D20C /* SDWebImageFrame.h in Headers */, 80377D1D1F2F66A100F89830 /* yuv.h in Headers */, 43CE75D01CFE98E0006C64D0 /* FLAnimatedImageView+WebCache.h in Headers */, - 807A12281F89636300EC2A9B /* SDWebImageCodersManager.h in Headers */, + 807A12281F89636300EC2A9B /* SDImageCodersManager.h in Headers */, 32B9B537206ED4230026769D /* SDWebImageDownloaderConfig.h in Headers */, 80377C051F2F665300F89830 /* huffman_utils.h in Headers */, 80377E881F2F66D000F89830 /* alphai_dec.h in Headers */, 32484775201775F600AF9E5A /* SDAnimatedImage.h in Headers */, - 321E60941F38E8ED00405457 /* SDWebImageImageIOCoder.h in Headers */, + 321E60941F38E8ED00405457 /* SDImageIOCoder.h in Headers */, 431738BD1CDFC2660008FEB9 /* decode.h in Headers */, 80377D0B1F2F66A100F89830 /* mips_macro.h in Headers */, 329A18591FFF5DFD008C9A2F /* UIImage+WebCache.h in Headers */, @@ -2938,7 +2938,7 @@ 80377C0B1F2F665300F89830 /* random_utils.h in Headers */, 80377E921F2F66D000F89830 /* vp8i_dec.h in Headers */, 5376131F155AD0D5005750A4 /* UIButton+WebCache.h in Headers */, - 327054D4206CD8B3006EA328 /* SDWebImageAPNGCoder.h in Headers */, + 327054D4206CD8B3006EA328 /* SDImageAPNGCoder.h in Headers */, 53761320155AD0D5005750A4 /* UIImageView+WebCache.h in Headers */, 328BB69C2081FED200760D6C /* SDWebImageCacheKeyFilter.h in Headers */, 530E49E816464C25002868E7 /* SDWebImageOperation.h in Headers */, @@ -2955,7 +2955,7 @@ 323F8B621F38EF770092B609 /* cost_enc.h in Headers */, 43CE75761CFE9427006C64D0 /* FLAnimatedImage.h in Headers */, 323F8BE41F38EF770092B609 /* vp8li_enc.h in Headers */, - 32FDE88F20888726008D7530 /* SDWebImageWebPCoder.h in Headers */, + 32FDE88F20888726008D7530 /* SDImageWebPCoder.h in Headers */, 320CAE152086F50500CFFC80 /* SDWebImageError.h in Headers */, 323F8B861F38EF770092B609 /* histogram_enc.h in Headers */, 321B37812083290E00C0EA77 /* SDWebImageLoader.h in Headers */, @@ -3271,9 +3271,9 @@ 323F8B991F38EF770092B609 /* near_lossless_enc.c in Sources */, 80377DE81F2F66A700F89830 /* yuv_mips_dsp_r2.c in Sources */, 80377EC31F2F66D500F89830 /* vp8l_dec.c in Sources */, - 327054DD206CD8B3006EA328 /* SDWebImageAPNGCoder.m in Sources */, + 327054DD206CD8B3006EA328 /* SDImageAPNGCoder.m in Sources */, 325312D1200F09910046BF1E /* SDWebImageTransition.m in Sources */, - 321E609D1F38E8ED00405457 /* SDWebImageImageIOCoder.m in Sources */, + 321E609D1F38E8ED00405457 /* SDImageIOCoder.m in Sources */, 323F8B9F1F38EF770092B609 /* picture_csp_enc.c in Sources */, 43C892A31D9D6DDD0022038D /* demux.c in Sources */, 00733A611BC4880000A5A117 /* UIImageView+WebCache.m in Sources */, @@ -3298,7 +3298,7 @@ 80377DAA1F2F66A700F89830 /* alpha_processing_sse2.c in Sources */, 43A9186E1D8308FE00B3925F /* SDImageCacheConfig.m in Sources */, 80377C471F2F666300F89830 /* bit_reader_utils.c in Sources */, - 321E60AB1F38E8F600405457 /* SDWebImageGIFCoder.m in Sources */, + 321E60AB1F38E8F600405457 /* SDImageGIFCoder.m in Sources */, 323F8BD51F38EF770092B609 /* tree_enc.c in Sources */, 80377DBB1F2F66A700F89830 /* dec_sse2.c in Sources */, 323F8B831F38EF770092B609 /* histogram_enc.c in Sources */, @@ -3322,7 +3322,7 @@ 321B378A2083290E00C0EA77 /* SDWebImageLoader.m in Sources */, 32484772201775F600AF9E5A /* SDAnimatedImage.m in Sources */, 323F8C1D1F38EF770092B609 /* muxread.c in Sources */, - 807A12311F89636300EC2A9B /* SDWebImageCodersManager.m in Sources */, + 807A12311F89636300EC2A9B /* SDImageCodersManager.m in Sources */, 80377C491F2F666300F89830 /* bit_writer_utils.c in Sources */, 323F8B471F38EF770092B609 /* analysis_enc.c in Sources */, 80377DB51F2F66A700F89830 /* cpu.c in Sources */, @@ -3333,7 +3333,7 @@ 80377EC01F2F66D500F89830 /* vp8_dec.c in Sources */, 80377C521F2F666300F89830 /* huffman_utils.c in Sources */, 80377DD81F2F66A700F89830 /* lossless.c in Sources */, - 32FDE89E20888726008D7530 /* SDWebImageWebPCoder.m in Sources */, + 32FDE89E20888726008D7530 /* SDImageWebPCoder.m in Sources */, 80377DE11F2F66A700F89830 /* rescaler_sse2.c in Sources */, 324DF4BD200A14DC008A84CC /* SDWebImageDefine.m in Sources */, 80377DAC1F2F66A700F89830 /* alpha_processing.c in Sources */, @@ -3422,9 +3422,9 @@ 3290FA0B1FA478AF0047D20C /* SDWebImageFrame.m in Sources */, 80377C2A1F2F666300F89830 /* utils.c in Sources */, 323F8B4B1F38EF770092B609 /* backward_references_enc.c in Sources */, - 807A122F1F89636300EC2A9B /* SDWebImageCodersManager.m in Sources */, + 807A122F1F89636300EC2A9B /* SDImageCodersManager.m in Sources */, 4314D1361D0E0E3B004B36C9 /* SDWebImageManager.m in Sources */, - 321E609B1F38E8ED00405457 /* SDWebImageImageIOCoder.m in Sources */, + 321E609B1F38E8ED00405457 /* SDImageIOCoder.m in Sources */, 80377D4E1F2F66A700F89830 /* lossless.c in Sources */, 80377D351F2F66A700F89830 /* enc_avx2.c in Sources */, 80377D201F2F66A700F89830 /* alpha_processing_sse2.c in Sources */, @@ -3488,7 +3488,7 @@ 80377C221F2F666300F89830 /* quant_levels_utils.c in Sources */, 80377D2E1F2F66A700F89830 /* dec_mips32.c in Sources */, 323F8BD31F38EF770092B609 /* tree_enc.c in Sources */, - 327054DB206CD8B3006EA328 /* SDWebImageAPNGCoder.m in Sources */, + 327054DB206CD8B3006EA328 /* SDImageAPNGCoder.m in Sources */, 80377D5C1F2F66A700F89830 /* upsampling_sse2.c in Sources */, 323F8BC71F38EF770092B609 /* syntax_enc.c in Sources */, 328BB6D42082581100760D6C /* SDMemoryCache.m in Sources */, @@ -3508,7 +3508,7 @@ 80377E971F2F66D400F89830 /* alpha_dec.c in Sources */, 323F8B691F38EF770092B609 /* delta_palettization_enc.c in Sources */, 4314D1501D0E0E3B004B36C9 /* UIView+WebCacheOperation.m in Sources */, - 321E60A91F38E8F600405457 /* SDWebImageGIFCoder.m in Sources */, + 321E60A91F38E8F600405457 /* SDImageGIFCoder.m in Sources */, 80377D5A1F2F66A700F89830 /* upsampling_msa.c in Sources */, 80377D491F2F66A700F89830 /* lossless_enc.c in Sources */, 80377C171F2F666300F89830 /* color_cache_utils.c in Sources */, @@ -3518,7 +3518,7 @@ 80377D5D1F2F66A700F89830 /* upsampling.c in Sources */, 80377D251F2F66A700F89830 /* argb.c in Sources */, 80377D281F2F66A700F89830 /* cost_mips32.c in Sources */, - 32FDE89C20888726008D7530 /* SDWebImageWebPCoder.m in Sources */, + 32FDE89C20888726008D7530 /* SDImageWebPCoder.m in Sources */, 323F8BF11F38EF770092B609 /* anim_encode.c in Sources */, 4314D1551D0E0E3B004B36C9 /* UIImageView+HighlightedWebCache.m in Sources */, 80377E991F2F66D400F89830 /* buffer_dec.c in Sources */, @@ -3590,9 +3590,9 @@ 80377E2F1F2F66A800F89830 /* yuv_sse2.c in Sources */, 431BB6AA1D06D2C1006A3455 /* SDWebImageManager.m in Sources */, 323F8B4E1F38EF770092B609 /* backward_references_enc.c in Sources */, - 807A12321F89636300EC2A9B /* SDWebImageCodersManager.m in Sources */, + 807A12321F89636300EC2A9B /* SDImageCodersManager.m in Sources */, 80377C761F2F666400F89830 /* thread_utils.c in Sources */, - 321E609E1F38E8ED00405457 /* SDWebImageImageIOCoder.m in Sources */, + 321E609E1F38E8ED00405457 /* SDImageIOCoder.m in Sources */, 80377E1D1F2F66A800F89830 /* lossless.c in Sources */, 80377E041F2F66A800F89830 /* enc_avx2.c in Sources */, 80377DEF1F2F66A800F89830 /* alpha_processing_sse2.c in Sources */, @@ -3654,7 +3654,7 @@ 80377E301F2F66A800F89830 /* yuv.c in Sources */, 43A9186F1D8308FE00B3925F /* SDImageCacheConfig.m in Sources */, 323F8BD61F38EF770092B609 /* tree_enc.c in Sources */, - 327054DE206CD8B3006EA328 /* SDWebImageAPNGCoder.m in Sources */, + 327054DE206CD8B3006EA328 /* SDImageAPNGCoder.m in Sources */, 80377DFD1F2F66A800F89830 /* dec_mips32.c in Sources */, 323F8BCA1F38EF770092B609 /* syntax_enc.c in Sources */, 328BB6D72082581100760D6C /* SDMemoryCache.m in Sources */, @@ -3674,7 +3674,7 @@ 80377EC71F2F66D500F89830 /* alpha_dec.c in Sources */, 323F8B6C1F38EF770092B609 /* delta_palettization_enc.c in Sources */, 80377C681F2F666400F89830 /* filters_utils.c in Sources */, - 321E60AC1F38E8F600405457 /* SDWebImageGIFCoder.m in Sources */, + 321E60AC1F38E8F600405457 /* SDImageGIFCoder.m in Sources */, 80377E291F2F66A800F89830 /* upsampling_msa.c in Sources */, 80377E181F2F66A800F89830 /* lossless_enc.c in Sources */, 431BB6C01D06D2C1006A3455 /* SDImageCache.m in Sources */, @@ -3684,7 +3684,7 @@ 80377E2C1F2F66A800F89830 /* upsampling.c in Sources */, 80377DF41F2F66A800F89830 /* argb.c in Sources */, 80377DF71F2F66A800F89830 /* cost_mips32.c in Sources */, - 32FDE89F20888726008D7530 /* SDWebImageWebPCoder.m in Sources */, + 32FDE89F20888726008D7530 /* SDImageWebPCoder.m in Sources */, 323F8BF41F38EF770092B609 /* anim_encode.c in Sources */, 80377C6E1F2F666400F89830 /* quant_levels_dec_utils.c in Sources */, 80377EC91F2F66D500F89830 /* buffer_dec.c in Sources */, @@ -3743,7 +3743,7 @@ 80377E581F2F66A800F89830 /* lossless_enc_mips32.c in Sources */, 4397D28F1D0DDD8C00BB2784 /* SDWebImageDownloaderOperation.m in Sources */, 323F8BB91F38EF770092B609 /* picture_tools_enc.c in Sources */, - 32FDE8A020888726008D7530 /* SDWebImageWebPCoder.m in Sources */, + 32FDE8A020888726008D7530 /* SDImageWebPCoder.m in Sources */, 80377E451F2F66A800F89830 /* dec_sse2.c in Sources */, 80377E3F1F2F66A800F89830 /* cpu.c in Sources */, 80377E4C1F2F66A800F89830 /* enc_msa.c in Sources */, @@ -3769,7 +3769,7 @@ 4397D2921D0DDD8C00BB2784 /* SDWebImagePrefetcher.m in Sources */, 323F8BBF1F38EF770092B609 /* predictor_enc.c in Sources */, 32FDE88E20888726008D7530 /* UIImage+WebP.m in Sources */, - 807A12331F89636300EC2A9B /* SDWebImageCodersManager.m in Sources */, + 807A12331F89636300EC2A9B /* SDImageCodersManager.m in Sources */, 323F8BD11F38EF770092B609 /* token_enc.c in Sources */, 323F8B4F1F38EF770092B609 /* backward_references_enc.c in Sources */, 80377E4D1F2F66A800F89830 /* enc_neon.c in Sources */, @@ -3815,8 +3815,8 @@ 80377ED91F2F66D500F89830 /* buffer_dec.c in Sources */, 4397D2A11D0DDD8C00BB2784 /* SDWebImageManager.m in Sources */, 323F8BCB1F38EF770092B609 /* syntax_enc.c in Sources */, - 321E60AD1F38E8F600405457 /* SDWebImageGIFCoder.m in Sources */, - 327054DF206CD8B3006EA328 /* SDWebImageAPNGCoder.m in Sources */, + 321E60AD1F38E8F600405457 /* SDImageGIFCoder.m in Sources */, + 327054DF206CD8B3006EA328 /* SDImageAPNGCoder.m in Sources */, 80377E341F2F66A800F89830 /* alpha_processing_sse2.c in Sources */, 4397D2A61D0DDD8C00BB2784 /* SDWebImageCompat.m in Sources */, 80377E6F1F2F66A800F89830 /* upsampling_neon.c in Sources */, @@ -3831,7 +3831,7 @@ 80377E321F2F66A800F89830 /* alpha_processing_mips_dsp_r2.c in Sources */, 323F8B611F38EF770092B609 /* cost_enc.c in Sources */, 80377EDE1F2F66D500F89830 /* quant_dec.c in Sources */, - 321E609F1F38E8ED00405457 /* SDWebImageImageIOCoder.m in Sources */, + 321E609F1F38E8ED00405457 /* SDImageIOCoder.m in Sources */, 323F8B5B1F38EF770092B609 /* config_enc.c in Sources */, 80377E361F2F66A800F89830 /* alpha_processing.c in Sources */, 80377E351F2F66A800F89830 /* alpha_processing_sse41.c in Sources */, @@ -3940,9 +3940,9 @@ 323F8B981F38EF770092B609 /* near_lossless_enc.c in Sources */, 80377D6F1F2F66A700F89830 /* cost.c in Sources */, 80377EB31F2F66D400F89830 /* vp8l_dec.c in Sources */, - 327054DC206CD8B3006EA328 /* SDWebImageAPNGCoder.m in Sources */, + 327054DC206CD8B3006EA328 /* SDImageAPNGCoder.m in Sources */, 325312D0200F09910046BF1E /* SDWebImageTransition.m in Sources */, - 321E609C1F38E8ED00405457 /* SDWebImageImageIOCoder.m in Sources */, + 321E609C1F38E8ED00405457 /* SDImageIOCoder.m in Sources */, 323F8B9E1F38EF770092B609 /* picture_csp_enc.c in Sources */, 80377D9E1F2F66A700F89830 /* upsampling_mips_dsp_r2.c in Sources */, 80377DA31F2F66A700F89830 /* yuv_mips_dsp_r2.c in Sources */, @@ -3966,7 +3966,7 @@ 80377D771F2F66A700F89830 /* dec_sse41.c in Sources */, 80377D891F2F66A700F89830 /* lossless_enc_mips32.c in Sources */, 80377D861F2F66A700F89830 /* filters.c in Sources */, - 321E60AA1F38E8F600405457 /* SDWebImageGIFCoder.m in Sources */, + 321E60AA1F38E8F600405457 /* SDImageGIFCoder.m in Sources */, 323F8BD41F38EF770092B609 /* tree_enc.c in Sources */, 80377D651F2F66A700F89830 /* alpha_processing_sse2.c in Sources */, 323F8B821F38EF770092B609 /* histogram_enc.c in Sources */, @@ -3992,7 +3992,7 @@ 32484771201775F600AF9E5A /* SDAnimatedImage.m in Sources */, 80377C3C1F2F666300F89830 /* quant_levels_utils.c in Sources */, 323F8C1C1F38EF770092B609 /* muxread.c in Sources */, - 807A12301F89636300EC2A9B /* SDWebImageCodersManager.m in Sources */, + 807A12301F89636300EC2A9B /* SDImageCodersManager.m in Sources */, 80377C2F1F2F666300F89830 /* bit_writer_utils.c in Sources */, 323F8B461F38EF770092B609 /* analysis_enc.c in Sources */, 80377D8C1F2F66A700F89830 /* lossless_enc_sse2.c in Sources */, @@ -4003,7 +4003,7 @@ 80377D911F2F66A700F89830 /* lossless_neon.c in Sources */, 80377EB01F2F66D400F89830 /* vp8_dec.c in Sources */, 80377C381F2F666300F89830 /* huffman_utils.c in Sources */, - 32FDE89D20888726008D7530 /* SDWebImageWebPCoder.m in Sources */, + 32FDE89D20888726008D7530 /* SDImageWebPCoder.m in Sources */, 80377C3A1F2F666300F89830 /* quant_levels_dec_utils.c in Sources */, 324DF4BC200A14DC008A84CC /* SDWebImageDefine.m in Sources */, 80377D931F2F66A700F89830 /* lossless.c in Sources */, @@ -4109,8 +4109,8 @@ 32F7C07E2030719600873181 /* UIImage+Transform.m in Sources */, 80377CE51F2F66A100F89830 /* cost.c in Sources */, 80377E931F2F66D000F89830 /* vp8l_dec.c in Sources */, - 321E609A1F38E8ED00405457 /* SDWebImageImageIOCoder.m in Sources */, - 327054DA206CD8B3006EA328 /* SDWebImageAPNGCoder.m in Sources */, + 321E609A1F38E8ED00405457 /* SDImageIOCoder.m in Sources */, + 327054DA206CD8B3006EA328 /* SDImageAPNGCoder.m in Sources */, 325312CE200F09910046BF1E /* SDWebImageTransition.m in Sources */, 323F8B9C1F38EF770092B609 /* picture_csp_enc.c in Sources */, 80377D141F2F66A100F89830 /* upsampling_mips_dsp_r2.c in Sources */, @@ -4136,7 +4136,7 @@ 80377CED1F2F66A100F89830 /* dec_sse41.c in Sources */, 80377CFF1F2F66A100F89830 /* lossless_enc_mips32.c in Sources */, 80377CFC1F2F66A100F89830 /* filters.c in Sources */, - 321E60A81F38E8F600405457 /* SDWebImageGIFCoder.m in Sources */, + 321E60A81F38E8F600405457 /* SDImageGIFCoder.m in Sources */, 323F8BD21F38EF770092B609 /* tree_enc.c in Sources */, 80377CDB1F2F66A100F89830 /* alpha_processing_sse2.c in Sources */, 323F8B801F38EF770092B609 /* histogram_enc.c in Sources */, @@ -4161,7 +4161,7 @@ 321B37872083290E00C0EA77 /* SDWebImageLoader.m in Sources */, 3248476F201775F600AF9E5A /* SDAnimatedImage.m in Sources */, 323F8C1A1F38EF770092B609 /* muxread.c in Sources */, - 807A122E1F89636300EC2A9B /* SDWebImageCodersManager.m in Sources */, + 807A122E1F89636300EC2A9B /* SDImageCodersManager.m in Sources */, 80377BFB1F2F665300F89830 /* bit_writer_utils.c in Sources */, 323F8B441F38EF770092B609 /* analysis_enc.c in Sources */, 80377D021F2F66A100F89830 /* lossless_enc_sse2.c in Sources */, @@ -4173,7 +4173,7 @@ 80377E901F2F66D000F89830 /* vp8_dec.c in Sources */, 80377C041F2F665300F89830 /* huffman_utils.c in Sources */, 80377C061F2F665300F89830 /* quant_levels_dec_utils.c in Sources */, - 32FDE89B20888726008D7530 /* SDWebImageWebPCoder.m in Sources */, + 32FDE89B20888726008D7530 /* SDImageWebPCoder.m in Sources */, 80377D091F2F66A100F89830 /* lossless.c in Sources */, 324DF4BA200A14DC008A84CC /* SDWebImageDefine.m in Sources */, 80377D121F2F66A100F89830 /* rescaler_sse2.c in Sources */, diff --git a/SDWebImage/SDAnimatedImage.h b/SDWebImage/SDAnimatedImage.h index 2c829f29..4a8a5270 100644 --- a/SDWebImage/SDAnimatedImage.h +++ b/SDWebImage/SDAnimatedImage.h @@ -11,7 +11,7 @@ /** - This is the protocol for SDAnimatedImage class only but not for SDWebImageAnimatedCoder. If you want to provide a custom animated image class with full advanced function, you can conform to this instead of the base protocol. + This is the protocol for SDAnimatedImage class only but not for SDAnimatedImageCoder. If you want to provide a custom animated image class with full advanced function, you can conform to this instead of the base protocol. */ @protocol SDAnimatedImage @@ -20,7 +20,7 @@ Initializes the image with an animated coder. You can use the coder to decode the image frame later. @note Normally we use `initWithData:scale:` to create custom animated image class. However, for progressive image decoding, we will use this with animated coder which conforms to `SDProgressiveImageCoder` as well instead. - @param animatedCoder An animated coder which conform `SDWebImageAnimatedCoder` protocol + @param animatedCoder An animated coder which conform `SDAnimatedImageCoder` protocol @param scale The scale factor to assume when interpreting the image data. Applying a scale factor of 1.0 results in an image whose size matches the pixel-based dimensions of the image. Applying a different scale factor changes the size of the image as reported by the `size` property. @return An initialized object */ diff --git a/SDWebImage/SDAnimatedImage.m b/SDWebImage/SDAnimatedImage.m index b9bb6a5f..28e6dcde 100644 --- a/SDWebImage/SDAnimatedImage.m +++ b/SDWebImage/SDAnimatedImage.m @@ -10,7 +10,7 @@ #import "NSImage+Compatibility.h" #import "UIImage+WebCache.h" #import "SDImageCoder.h" -#import "SDWebImageCodersManager.h" +#import "SDImageCodersManager.h" #import "SDWebImageFrame.h" #define LOCK(...) dispatch_semaphore_wait(self->_lock, DISPATCH_TIME_FOREVER); \ @@ -286,7 +286,7 @@ static NSArray *SDBundlePreferredScales() { } data = [data copy]; // avoid mutable data id animatedCoder = nil; - for (idcoder in [SDWebImageCodersManager sharedManager].coders) { + for (idcoder in [SDImageCodersManager sharedManager].coders) { if ([coder conformsToProtocol:@protocol(SDAnimatedImageCoder)]) { if ([coder canDecodeFromData:data]) { animatedCoder = [[[coder class] alloc] initWithAnimatedImageData:data options:@{SDImageCoderDecodeScaleFactor : @(scale)}]; @@ -357,7 +357,7 @@ static NSArray *SDBundlePreferredScales() { return self; } id animatedCoder = nil; - for (idcoder in [SDWebImageCodersManager sharedManager].coders) { + for (idcoder in [SDImageCodersManager sharedManager].coders) { if ([coder conformsToProtocol:@protocol(SDAnimatedImageCoder)]) { if ([coder canDecodeFromData:animatedImageData]) { animatedCoder = [[[coder class] alloc] initWithAnimatedImageData:animatedImageData options:@{SDImageCoderDecodeScaleFactor : @(scale)}]; diff --git a/SDWebImage/SDAnimatedImageRep.h b/SDWebImage/SDAnimatedImageRep.h index 32da091b..929d82af 100644 --- a/SDWebImage/SDAnimatedImageRep.h +++ b/SDWebImage/SDAnimatedImageRep.h @@ -11,8 +11,8 @@ #if SD_MAC // A subclass of `NSBitmapImageRep` to fix that GIF loop count issue because `NSBitmapImageRep` will reset `NSImageCurrentFrameDuration` by using `kCGImagePropertyGIFDelayTime` but not `kCGImagePropertyGIFUnclampedDelayTime`. -// Built in GIF coder use this instead of `NSBitmapImageRep` for better GIF rendering. If you do not want this, only enable `SDWebImageImageIOCoder`, which just call `NSImage` API and actually use `NSBitmapImageRep` for GIF image. -// This also support APNG format using `SDWebImageAPNGCoder`. Which provide full alpha-channel support and the correct duration match the `kCGImagePropertyAPNGUnclampedDelayTime`. +// Built in GIF coder use this instead of `NSBitmapImageRep` for better GIF rendering. If you do not want this, only enable `SDImageIOCoder`, which just call `NSImage` API and actually use `NSBitmapImageRep` for GIF image. +// This also support APNG format using `SDImageAPNGCoder`. Which provide full alpha-channel support and the correct duration match the `kCGImagePropertyAPNGUnclampedDelayTime`. @interface SDAnimatedImageRep : NSBitmapImageRep diff --git a/SDWebImage/SDAnimatedImageRep.m b/SDWebImage/SDAnimatedImageRep.m index e8b95cc9..1fc459e5 100644 --- a/SDWebImage/SDAnimatedImageRep.m +++ b/SDWebImage/SDAnimatedImageRep.m @@ -10,16 +10,16 @@ #if SD_MAC -#import "SDWebImageGIFCoder.h" -#import "SDWebImageAPNGCoder.h" +#import "SDImageGIFCoder.h" +#import "SDImageAPNGCoder.h" -@interface SDWebImageGIFCoder () +@interface SDImageGIFCoder () - (float)sd_frameDurationAtIndex:(NSUInteger)index source:(CGImageSourceRef)source; @end -@interface SDWebImageAPNGCoder () +@interface SDImageAPNGCoder () - (float)sd_frameDurationAtIndex:(NSUInteger)index source:(CGImageSourceRef)source; - (NSUInteger)sd_imageLoopCountWithSource:(CGImageSourceRef)source; @@ -64,7 +64,7 @@ // Do initilize about frame count, current frame/duration and loop count [self setProperty:NSImageFrameCount withValue:@(frameCount)]; [self setProperty:NSImageCurrentFrame withValue:@(0)]; - NSUInteger loopCount = [[SDWebImageAPNGCoder sharedCoder] sd_imageLoopCountWithSource:imageSource]; + NSUInteger loopCount = [[SDImageAPNGCoder sharedCoder] sd_imageLoopCountWithSource:imageSource]; [self setProperty:NSImageLoopCount withValue:@(loopCount)]; } } @@ -89,10 +89,10 @@ float frameDuration = 0; if (CFStringCompare(type, kUTTypeGIF, 0) == kCFCompareEqualTo) { // GIF - frameDuration = [[SDWebImageGIFCoder sharedCoder] sd_frameDurationAtIndex:index source:imageSource]; + frameDuration = [[SDImageGIFCoder sharedCoder] sd_frameDurationAtIndex:index source:imageSource]; } else if (CFStringCompare(type, kUTTypePNG, 0) == kCFCompareEqualTo) { // APNG - frameDuration = [[SDWebImageAPNGCoder sharedCoder] sd_frameDurationAtIndex:index source:imageSource]; + frameDuration = [[SDImageAPNGCoder sharedCoder] sd_frameDurationAtIndex:index source:imageSource]; } if (!frameDuration) { return; diff --git a/SDWebImage/SDWebImageAPNGCoder.h b/SDWebImage/SDImageAPNGCoder.h similarity index 68% rename from SDWebImage/SDWebImageAPNGCoder.h rename to SDWebImage/SDImageAPNGCoder.h index 489513c0..a674a95b 100644 --- a/SDWebImage/SDWebImageAPNGCoder.h +++ b/SDWebImage/SDImageAPNGCoder.h @@ -12,8 +12,8 @@ /** Built in coder using ImageIO that supports APNG encoding/decoding */ -@interface SDWebImageAPNGCoder : NSObject +@interface SDImageAPNGCoder : NSObject -@property (nonatomic, class, readonly, nonnull) SDWebImageAPNGCoder *sharedCoder; +@property (nonatomic, class, readonly, nonnull) SDImageAPNGCoder *sharedCoder; @end diff --git a/SDWebImage/SDWebImageAPNGCoder.m b/SDWebImage/SDImageAPNGCoder.m similarity index 98% rename from SDWebImage/SDWebImageAPNGCoder.m rename to SDWebImage/SDImageAPNGCoder.m index 5a2ac166..b62b633a 100644 --- a/SDWebImage/SDWebImageAPNGCoder.m +++ b/SDWebImage/SDImageAPNGCoder.m @@ -6,7 +6,7 @@ * file that was distributed with this source code. */ -#import "SDWebImageAPNGCoder.h" +#import "SDImageAPNGCoder.h" #import #import "NSData+ImageContentType.h" #import "UIImage+WebCache.h" @@ -31,7 +31,7 @@ const CFStringRef kCGImagePropertyAPNGUnclampedDelayTime = (__bridge CFStringRef @implementation SDAPNGCoderFrame @end -@implementation SDWebImageAPNGCoder { +@implementation SDImageAPNGCoder { size_t _width, _height; CGImageSourceRef _imageSource; NSData *_imageData; @@ -63,10 +63,10 @@ const CFStringRef kCGImagePropertyAPNGUnclampedDelayTime = (__bridge CFStringRef } + (instancetype)sharedCoder { - static SDWebImageAPNGCoder *coder; + static SDImageAPNGCoder *coder; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - coder = [[SDWebImageAPNGCoder alloc] init]; + coder = [[SDImageAPNGCoder alloc] init]; }); return coder; } @@ -315,7 +315,7 @@ const CFStringRef kCGImagePropertyAPNGUnclampedDelayTime = (__bridge CFStringRef return image; } -#pragma mark - SDWebImageAnimatedCoder +#pragma mark - SDAnimatedImageCoder - (nullable instancetype)initWithAnimatedImageData:(nullable NSData *)data options:(nullable SDImageCoderOptions *)options { if (!data) { return nil; diff --git a/SDWebImage/SDImageCache.m b/SDWebImage/SDImageCache.m index 175256ff..f556860a 100644 --- a/SDWebImage/SDImageCache.m +++ b/SDWebImage/SDImageCache.m @@ -11,7 +11,7 @@ #import "SDDiskCache.h" #import "NSImage+Compatibility.h" #import "UIImage+WebCache.h" -#import "SDWebImageCodersManager.h" +#import "SDImageCodersManager.h" #import "SDWebImageTransformer.h" #import "SDWebImageCoderHelper.h" #import "SDAnimatedImage.h" @@ -182,7 +182,7 @@ } else { format = SDImageFormatJPEG; } - data = [[SDWebImageCodersManager sharedManager] encodedDataWithImage:image format:format options:nil]; + data = [[SDImageCodersManager sharedManager] encodedDataWithImage:image format:format options:nil]; } [self _storeImageDataToDisk:data forKey:key]; } diff --git a/SDWebImage/SDImageCacheDefine.m b/SDWebImage/SDImageCacheDefine.m index e3414c7a..9f01cf63 100644 --- a/SDWebImage/SDImageCacheDefine.m +++ b/SDWebImage/SDImageCacheDefine.m @@ -7,7 +7,7 @@ */ #import "SDImageCacheDefine.h" -#import "SDWebImageCodersManager.h" +#import "SDImageCodersManager.h" #import "SDWebImageCoderHelper.h" #import "SDAnimatedImage.h" #import "UIImage+WebCache.h" @@ -33,7 +33,7 @@ UIImage * _Nullable SDImageCacheDecodeImageData(NSData * _Nonnull imageData, NSS } } if (!image) { - image = [[SDWebImageCodersManager sharedManager] decodedImageWithData:imageData options:@{SDImageCoderDecodeFirstFrameOnly : @(decodeFirstFrame), SDImageCoderDecodeScaleFactor : @(scale)}]; + image = [[SDImageCodersManager sharedManager] decodedImageWithData:imageData options:@{SDImageCoderDecodeFirstFrameOnly : @(decodeFirstFrame), SDImageCoderDecodeScaleFactor : @(scale)}]; } if (image) { BOOL shouldDecode = (options & SDWebImageAvoidDecodeImage) == 0; diff --git a/SDWebImage/SDImageCoder.h b/SDWebImage/SDImageCoder.h index efa2352e..ebf151b2 100644 --- a/SDWebImage/SDImageCoder.h +++ b/SDWebImage/SDImageCoder.h @@ -22,7 +22,7 @@ typedef NSDictionary SDImageCoderOptions; FOUNDATION_EXPORT SDImageCoderOption _Nonnull const SDImageCoderDecodeFirstFrameOnly; /** A CGFloat value which is greater than or equal to 1.0. This value specify the image scale factor for decoding. If not provide, use 1.0. (NSNumber) - @note works for `SDImageCoder`, `SDProgressiveImageCoder`, `SDWebImageAnimatedCoder`. + @note works for `SDImageCoder`, `SDProgressiveImageCoder`, `SDAnimatedImageCoder`. */ FOUNDATION_EXPORT SDImageCoderOption _Nonnull const SDImageCoderDecodeScaleFactor; @@ -129,7 +129,7 @@ FOUNDATION_EXPORT SDImageCoderOption _Nonnull const SDImageCoderEncodeCompressio /** Incremental decode the current image data to image. - @note Due to the performance issue for progressive decoding and the integration for image view. This method may only return the first frame image even if the image data is animated image. If you want progressive animated image decoding, conform to `SDWebImageAnimatedCoder` protocol as well and use `animatedImageFrameAtIndex:` instead. + @note Due to the performance issue for progressive decoding and the integration for image view. This method may only return the first frame image even if the image data is animated image. If you want progressive animated image decoding, conform to `SDAnimatedImageCoder` protocol as well and use `animatedImageFrameAtIndex:` instead. @param options A dictionary containing any progressive decoding options. Pass @{SDImageCoderDecodeScaleFactor: @(1.0)} to specify scale factor for progressive image @return The decoded image from current data @@ -140,7 +140,7 @@ FOUNDATION_EXPORT SDImageCoderOption _Nonnull const SDImageCoderEncodeCompressio #pragma mark - Animated Image Provider /** - This is the animated image protocol to provide the basic function for animated image rendering. It's adopted by `SDAnimatedImage` and `SDWebImageAnimatedCoder` + This is the animated image protocol to provide the basic function for animated image rendering. It's adopted by `SDAnimatedImage` and `SDAnimatedImageCoder` */ @protocol SDAnimatedImageProvider diff --git a/SDWebImage/SDWebImageCodersManager.h b/SDWebImage/SDImageCodersManager.h similarity index 93% rename from SDWebImage/SDWebImageCodersManager.h rename to SDWebImage/SDImageCodersManager.h index ef68bd75..0e3b20db 100644 --- a/SDWebImage/SDWebImageCodersManager.h +++ b/SDWebImage/SDImageCodersManager.h @@ -29,12 +29,12 @@ Those methods are called on each coder in the array (using the priority order) until one of them returns YES. That means that coder can decode that data / encode to that format */ -@interface SDWebImageCodersManager : NSObject +@interface SDImageCodersManager : NSObject /** Returns the global shared coders manager instance. */ -@property (nonatomic, class, readonly, nonnull) SDWebImageCodersManager *sharedManager; +@property (nonatomic, class, readonly, nonnull) SDImageCodersManager *sharedManager; /** All coders in coders manager. The coders array is a priority queue, which means the later added coder will have the highest priority diff --git a/SDWebImage/SDWebImageCodersManager.m b/SDWebImage/SDImageCodersManager.m similarity index 89% rename from SDWebImage/SDWebImageCodersManager.m rename to SDWebImage/SDImageCodersManager.m index add2bbae..c1378d1d 100644 --- a/SDWebImage/SDWebImageCodersManager.m +++ b/SDWebImage/SDImageCodersManager.m @@ -6,12 +6,12 @@ * file that was distributed with this source code. */ -#import "SDWebImageCodersManager.h" -#import "SDWebImageImageIOCoder.h" -#import "SDWebImageGIFCoder.h" -#import "SDWebImageAPNGCoder.h" +#import "SDImageCodersManager.h" +#import "SDImageIOCoder.h" +#import "SDImageGIFCoder.h" +#import "SDImageAPNGCoder.h" #ifdef SD_WEBP -#import "SDWebImageWebPCoder.h" +#import "SDImageWebPCoder.h" #endif #import "NSImage+Compatibility.h" #import "UIImage+WebCache.h" @@ -20,13 +20,13 @@ #define LOCK(lock) dispatch_semaphore_wait(lock, DISPATCH_TIME_FOREVER); #define UNLOCK(lock) dispatch_semaphore_signal(lock); -@interface SDWebImageCodersManager () +@interface SDImageCodersManager () @property (nonatomic, strong, nonnull) dispatch_semaphore_t codersLock; @end -@implementation SDWebImageCodersManager +@implementation SDImageCodersManager + (nonnull instancetype)sharedManager { static dispatch_once_t once; @@ -40,9 +40,9 @@ - (instancetype)init { if (self = [super init]) { // initialize with default coders - NSMutableArray> *mutableCoders = [@[[SDWebImageImageIOCoder sharedCoder], [SDWebImageGIFCoder sharedCoder], [SDWebImageAPNGCoder sharedCoder]] mutableCopy]; + NSMutableArray> *mutableCoders = [@[[SDImageIOCoder sharedCoder], [SDImageGIFCoder sharedCoder], [SDImageAPNGCoder sharedCoder]] mutableCopy]; #ifdef SD_WEBP - [mutableCoders addObject:[SDWebImageWebPCoder sharedCoder]]; + [mutableCoders addObject:[SDImageWebPCoder sharedCoder]]; #endif _coders = [mutableCoders copy]; _codersLock = dispatch_semaphore_create(1); diff --git a/SDWebImage/SDWebImageGIFCoder.h b/SDWebImage/SDImageGIFCoder.h similarity index 62% rename from SDWebImage/SDWebImageGIFCoder.h rename to SDWebImage/SDImageGIFCoder.h index 6b9c7ec2..3c66fe36 100644 --- a/SDWebImage/SDWebImageGIFCoder.h +++ b/SDWebImage/SDImageGIFCoder.h @@ -12,11 +12,11 @@ /** Built in coder using ImageIO that supports GIF encoding/decoding @note `SDWebImageIOCoder` supports GIF but only as static (will use the 1st frame). - @note Use `SDWebImageGIFCoder` for fully animated GIFs. For `UIImageView`, it will produce animated `UIImage`(`NSImage` on macOS) for rendering. For `SDAnimatedImageView`, it will use `SDAnimatedImage` for rendering. + @note Use `SDImageGIFCoder` for fully animated GIFs. For `UIImageView`, it will produce animated `UIImage`(`NSImage` on macOS) for rendering. For `SDAnimatedImageView`, it will use `SDAnimatedImage` for rendering. @note The recommended approach for animated GIFs is using `SDAnimatedImage` with `SDAnimatedImageView`. It's more performant than `UIImageView` for GIF displaying(especially on memory usage) */ -@interface SDWebImageGIFCoder : NSObject +@interface SDImageGIFCoder : NSObject -@property (nonatomic, class, readonly, nonnull) SDWebImageGIFCoder *sharedCoder; +@property (nonatomic, class, readonly, nonnull) SDImageGIFCoder *sharedCoder; @end diff --git a/SDWebImage/SDWebImageGIFCoder.m b/SDWebImage/SDImageGIFCoder.m similarity index 98% rename from SDWebImage/SDWebImageGIFCoder.m rename to SDWebImage/SDImageGIFCoder.m index efffaffd..4a3a0a6f 100644 --- a/SDWebImage/SDWebImageGIFCoder.m +++ b/SDWebImage/SDImageGIFCoder.m @@ -6,7 +6,7 @@ * file that was distributed with this source code. */ -#import "SDWebImageGIFCoder.h" +#import "SDImageGIFCoder.h" #import "NSImage+Compatibility.h" #import "UIImage+WebCache.h" #import @@ -24,7 +24,7 @@ @implementation SDGIFCoderFrame @end -@implementation SDWebImageGIFCoder { +@implementation SDImageGIFCoder { size_t _width, _height; CGImageSourceRef _imageSource; NSData *_imageData; @@ -56,10 +56,10 @@ } + (instancetype)sharedCoder { - static SDWebImageGIFCoder *coder; + static SDImageGIFCoder *coder; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - coder = [[SDWebImageGIFCoder alloc] init]; + coder = [[SDImageGIFCoder alloc] init]; }); return coder; } @@ -316,7 +316,7 @@ return [imageData copy]; } -#pragma mark - SDWebImageAnimatedCoder +#pragma mark - SDAnimatedImageCoder - (nullable instancetype)initWithAnimatedImageData:(nullable NSData *)data options:(nullable SDImageCoderOptions *)options { if (!data) { return nil; diff --git a/SDWebImage/SDWebImageImageIOCoder.h b/SDWebImage/SDImageIOCoder.h similarity index 85% rename from SDWebImage/SDWebImageImageIOCoder.h rename to SDWebImage/SDImageIOCoder.h index 9551a696..634eb7bb 100644 --- a/SDWebImage/SDWebImageImageIOCoder.h +++ b/SDWebImage/SDImageIOCoder.h @@ -14,7 +14,7 @@ GIF Also supports static GIF (meaning will only handle the 1st frame). - For a full GIF support, we recommend `FLAnimatedImage` or our less performant `SDWebImageGIFCoder` + For a full GIF support, we recommend `FLAnimatedImage` or our less performant `SDImageGIFCoder` HEIC This coder also supports HEIC format because ImageIO supports it natively. But it depends on the system capabilities, so it won't work on all devices, see: https://devstreaming-cdn.apple.com/videos/wwdc/2017/511tj33587vdhds/511/511_working_with_heif_and_hevc.pdf @@ -23,8 +23,8 @@ Encode(Software): macOS 10.13 Encode(Hardware): !Simulator && ((iOS 11 && A10FusionChip) || (macOS 10.13 && 6thGenerationIntelCPU)) */ -@interface SDWebImageImageIOCoder : NSObject +@interface SDImageIOCoder : NSObject -@property (nonatomic, class, readonly, nonnull) SDWebImageImageIOCoder *sharedCoder; +@property (nonatomic, class, readonly, nonnull) SDImageIOCoder *sharedCoder; @end diff --git a/SDWebImage/SDWebImageImageIOCoder.m b/SDWebImage/SDImageIOCoder.m similarity index 98% rename from SDWebImage/SDWebImageImageIOCoder.m rename to SDWebImage/SDImageIOCoder.m index 071d6801..e24c20f4 100644 --- a/SDWebImage/SDWebImageImageIOCoder.m +++ b/SDWebImage/SDImageIOCoder.m @@ -6,13 +6,13 @@ * file that was distributed with this source code. */ -#import "SDWebImageImageIOCoder.h" +#import "SDImageIOCoder.h" #import "SDWebImageCoderHelper.h" #import "NSImage+Compatibility.h" #import #import "NSData+ImageContentType.h" -@implementation SDWebImageImageIOCoder { +@implementation SDImageIOCoder { size_t _width, _height; CGImagePropertyOrientation _orientation; CGImageSourceRef _imageSource; @@ -38,10 +38,10 @@ } + (instancetype)sharedCoder { - static SDWebImageImageIOCoder *coder; + static SDImageIOCoder *coder; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - coder = [[SDWebImageImageIOCoder alloc] init]; + coder = [[SDImageIOCoder alloc] init]; }); return coder; } diff --git a/SDWebImage/SDWebImageLoader.m b/SDWebImage/SDWebImageLoader.m index dd55b65e..1628302a 100644 --- a/SDWebImage/SDWebImageLoader.m +++ b/SDWebImage/SDWebImageLoader.m @@ -8,7 +8,7 @@ #import "SDWebImageLoader.h" #import "SDWebImageCacheKeyFilter.h" -#import "SDWebImageCodersManager.h" +#import "SDImageCodersManager.h" #import "SDWebImageCoderHelper.h" #import "SDAnimatedImage.h" #import "UIImage+WebCache.h" @@ -47,7 +47,7 @@ UIImage * _Nullable SDWebImageLoaderDecodeImageData(NSData * _Nonnull imageData, } } if (!image) { - image = [[SDWebImageCodersManager sharedManager] decodedImageWithData:imageData options:@{SDImageCoderDecodeFirstFrameOnly : @(decodeFirstFrame), SDImageCoderDecodeScaleFactor : @(scale)}]; + image = [[SDImageCodersManager sharedManager] decodedImageWithData:imageData options:@{SDImageCoderDecodeFirstFrameOnly : @(decodeFirstFrame), SDImageCoderDecodeScaleFactor : @(scale)}]; } if (image) { BOOL shouldDecode = (options & SDWebImageAvoidDecodeImage) == 0; @@ -94,7 +94,7 @@ UIImage * _Nullable SDWebImageLoaderDecodeProgressiveImageData(NSData * _Nonnull id progressiveCoder = objc_getAssociatedObject(operation, SDWebImageLoaderProgressiveCoderKey); if (!progressiveCoder) { // We need to create a new instance for progressive decoding to avoid conflicts - for (idcoder in [SDWebImageCodersManager sharedManager].coders.reverseObjectEnumerator) { + for (idcoder in [SDImageCodersManager sharedManager].coders.reverseObjectEnumerator) { if ([coder conformsToProtocol:@protocol(SDProgressiveImageCoder)] && [((id)coder) canIncrementalDecodeFromData:imageData]) { progressiveCoder = [[[coder class] alloc] initIncrementalWithOptions:@{SDImageCoderDecodeScaleFactor : @(scale)}]; diff --git a/SDWebImage/UIImage+GIF.m b/SDWebImage/UIImage+GIF.m index 512baa21..d2672721 100644 --- a/SDWebImage/UIImage+GIF.m +++ b/SDWebImage/UIImage+GIF.m @@ -8,7 +8,7 @@ */ #import "UIImage+GIF.h" -#import "SDWebImageGIFCoder.h" +#import "SDImageGIFCoder.h" @implementation UIImage (GIF) @@ -21,7 +21,7 @@ return nil; } SDImageCoderOptions *options = @{SDImageCoderDecodeFirstFrameOnly : @(firstFrameOnly)}; - return [[SDWebImageGIFCoder sharedCoder] decodedImageWithData:data options:options]; + return [[SDImageGIFCoder sharedCoder] decodedImageWithData:data options:options]; } @end diff --git a/SDWebImage/UIImage+MultiFormat.m b/SDWebImage/UIImage+MultiFormat.m index 2fc7e9f7..0e59b18d 100644 --- a/SDWebImage/UIImage+MultiFormat.m +++ b/SDWebImage/UIImage+MultiFormat.m @@ -7,7 +7,7 @@ */ #import "UIImage+MultiFormat.h" -#import "SDWebImageCodersManager.h" +#import "SDImageCodersManager.h" @implementation UIImage (MultiFormat) @@ -23,7 +23,7 @@ scale = 1; } SDImageCoderOptions *options = @{SDImageCoderDecodeScaleFactor : @(scale)}; - return [[SDWebImageCodersManager sharedManager] decodedImageWithData:data options:options]; + return [[SDImageCodersManager sharedManager] decodedImageWithData:data options:options]; } - (nullable NSData *)sd_imageData { @@ -36,7 +36,7 @@ - (nullable NSData *)sd_imageDataAsFormat:(SDImageFormat)imageFormat compressionQuality:(double)compressionQuality { SDImageCoderOptions *options = @{SDImageCoderEncodeCompressionQuality : @(compressionQuality)}; - return [[SDWebImageCodersManager sharedManager] encodedDataWithImage:self format:imageFormat options:options]; + return [[SDImageCodersManager sharedManager] encodedDataWithImage:self format:imageFormat options:options]; } @end diff --git a/SDWebImage/WebP/SDWebImageWebPCoder.h b/SDWebImage/WebP/SDImageWebPCoder.h similarity index 68% rename from SDWebImage/WebP/SDWebImageWebPCoder.h rename to SDWebImage/WebP/SDImageWebPCoder.h index 461a6840..ae62a6b8 100644 --- a/SDWebImage/WebP/SDWebImageWebPCoder.h +++ b/SDWebImage/WebP/SDImageWebPCoder.h @@ -14,9 +14,9 @@ /** Built in coder that supports WebP and animated WebP */ -@interface SDWebImageWebPCoder : NSObject +@interface SDImageWebPCoder : NSObject -@property (nonatomic, class, readonly, nonnull) SDWebImageWebPCoder *sharedCoder; +@property (nonatomic, class, readonly, nonnull) SDImageWebPCoder *sharedCoder; @end diff --git a/SDWebImage/WebP/SDWebImageWebPCoder.m b/SDWebImage/WebP/SDImageWebPCoder.m similarity index 99% rename from SDWebImage/WebP/SDWebImageWebPCoder.m rename to SDWebImage/WebP/SDImageWebPCoder.m index 6a998b02..7686003f 100644 --- a/SDWebImage/WebP/SDWebImageWebPCoder.m +++ b/SDWebImage/WebP/SDImageWebPCoder.m @@ -8,7 +8,7 @@ #ifdef SD_WEBP -#import "SDWebImageWebPCoder.h" +#import "SDImageWebPCoder.h" #import "SDWebImageCoderHelper.h" #import "NSImage+Compatibility.h" #import "UIImage+WebCache.h" @@ -48,7 +48,7 @@ dispatch_semaphore_signal(self->_lock); @implementation SDWebPCoderFrame @end -@implementation SDWebImageWebPCoder { +@implementation SDImageWebPCoder { WebPIDecoder *_idec; WebPDemuxer *_demux; NSData *_imageData; @@ -82,10 +82,10 @@ dispatch_semaphore_signal(self->_lock); } + (instancetype)sharedCoder { - static SDWebImageWebPCoder *coder; + static SDImageWebPCoder *coder; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - coder = [[SDWebImageWebPCoder alloc] init]; + coder = [[SDImageWebPCoder alloc] init]; }); return coder; } @@ -525,7 +525,7 @@ static void FreeImageData(void *info, const void *data, size_t size) { free((void *)data); } -#pragma mark - SDWebImageAnimatedCoder +#pragma mark - SDAnimatedImageCoder - (instancetype)initWithAnimatedImageData:(NSData *)data options:(nullable SDImageCoderOptions *)options { if (!data) { return nil; diff --git a/SDWebImage/WebP/UIImage+WebP.m b/SDWebImage/WebP/UIImage+WebP.m index 919af914..9fe69554 100644 --- a/SDWebImage/WebP/UIImage+WebP.m +++ b/SDWebImage/WebP/UIImage+WebP.m @@ -9,7 +9,7 @@ #ifdef SD_WEBP #import "UIImage+WebP.h" -#import "SDWebImageWebPCoder.h" +#import "SDImageWebPCoder.h" @implementation UIImage (WebP) @@ -22,7 +22,7 @@ return nil; } SDImageCoderOptions *options = @{SDImageCoderDecodeFirstFrameOnly : @(firstFrameOnly)}; - return [[SDWebImageWebPCoder sharedCoder] decodedImageWithData:data options:options]; + return [[SDImageWebPCoder sharedCoder] decodedImageWithData:data options:options]; } @end diff --git a/WebImage/SDWebImage.h b/WebImage/SDWebImage.h index c383d2c8..ad7445d9 100644 --- a/WebImage/SDWebImage.h +++ b/WebImage/SDWebImage.h @@ -52,11 +52,11 @@ FOUNDATION_EXPORT const unsigned char WebImageVersionString[]; #import #import #import -#import +#import #import -#import -#import -#import +#import +#import +#import #import #import #import @@ -90,5 +90,5 @@ FOUNDATION_EXPORT const unsigned char WebImageVersionString[]; // WebP #if __has_include() #import -#import +#import #endif