Renaming UIImage+WebCache to the correct naming UIImage+Metadata, make clear of the category usage

This commit is contained in:
DreamPiggy 2018-06-25 13:52:46 +08:00
parent 9452012ea2
commit a82a4e15b2
21 changed files with 63 additions and 63 deletions

View File

@ -470,18 +470,18 @@
3290FA0D1FA478AF0047D20C /* SDImageFrame.m in Sources */ = {isa = PBXBuildFile; fileRef = 3290FA031FA478AF0047D20C /* SDImageFrame.m */; }; 3290FA0D1FA478AF0047D20C /* SDImageFrame.m in Sources */ = {isa = PBXBuildFile; fileRef = 3290FA031FA478AF0047D20C /* SDImageFrame.m */; };
3290FA0E1FA478AF0047D20C /* SDImageFrame.m in Sources */ = {isa = PBXBuildFile; fileRef = 3290FA031FA478AF0047D20C /* SDImageFrame.m */; }; 3290FA0E1FA478AF0047D20C /* SDImageFrame.m in Sources */ = {isa = PBXBuildFile; fileRef = 3290FA031FA478AF0047D20C /* SDImageFrame.m */; };
3290FA0F1FA478AF0047D20C /* SDImageFrame.m in Sources */ = {isa = PBXBuildFile; fileRef = 3290FA031FA478AF0047D20C /* SDImageFrame.m */; }; 3290FA0F1FA478AF0047D20C /* SDImageFrame.m in Sources */ = {isa = PBXBuildFile; fileRef = 3290FA031FA478AF0047D20C /* SDImageFrame.m */; };
329A18591FFF5DFD008C9A2F /* UIImage+WebCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 329A18571FFF5DFD008C9A2F /* UIImage+WebCache.h */; settings = {ATTRIBUTES = (Public, ); }; }; 329A18591FFF5DFD008C9A2F /* UIImage+Metadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 329A18571FFF5DFD008C9A2F /* UIImage+Metadata.h */; settings = {ATTRIBUTES = (Public, ); }; };
329A185A1FFF5DFD008C9A2F /* UIImage+WebCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 329A18571FFF5DFD008C9A2F /* UIImage+WebCache.h */; settings = {ATTRIBUTES = (Public, ); }; }; 329A185A1FFF5DFD008C9A2F /* UIImage+Metadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 329A18571FFF5DFD008C9A2F /* UIImage+Metadata.h */; settings = {ATTRIBUTES = (Public, ); }; };
329A185B1FFF5DFD008C9A2F /* UIImage+WebCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 329A18571FFF5DFD008C9A2F /* UIImage+WebCache.h */; settings = {ATTRIBUTES = (Public, ); }; }; 329A185B1FFF5DFD008C9A2F /* UIImage+Metadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 329A18571FFF5DFD008C9A2F /* UIImage+Metadata.h */; settings = {ATTRIBUTES = (Public, ); }; };
329A185C1FFF5DFD008C9A2F /* UIImage+WebCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 329A18571FFF5DFD008C9A2F /* UIImage+WebCache.h */; settings = {ATTRIBUTES = (Public, ); }; }; 329A185C1FFF5DFD008C9A2F /* UIImage+Metadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 329A18571FFF5DFD008C9A2F /* UIImage+Metadata.h */; settings = {ATTRIBUTES = (Public, ); }; };
329A185D1FFF5DFD008C9A2F /* UIImage+WebCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 329A18571FFF5DFD008C9A2F /* UIImage+WebCache.h */; settings = {ATTRIBUTES = (Public, ); }; }; 329A185D1FFF5DFD008C9A2F /* UIImage+Metadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 329A18571FFF5DFD008C9A2F /* UIImage+Metadata.h */; settings = {ATTRIBUTES = (Public, ); }; };
329A185E1FFF5DFD008C9A2F /* UIImage+WebCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 329A18571FFF5DFD008C9A2F /* UIImage+WebCache.h */; settings = {ATTRIBUTES = (Public, ); }; }; 329A185E1FFF5DFD008C9A2F /* UIImage+Metadata.h in Headers */ = {isa = PBXBuildFile; fileRef = 329A18571FFF5DFD008C9A2F /* UIImage+Metadata.h */; settings = {ATTRIBUTES = (Public, ); }; };
329A185F1FFF5DFD008C9A2F /* UIImage+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 329A18581FFF5DFD008C9A2F /* UIImage+WebCache.m */; }; 329A185F1FFF5DFD008C9A2F /* UIImage+Metadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 329A18581FFF5DFD008C9A2F /* UIImage+Metadata.m */; };
329A18601FFF5DFD008C9A2F /* UIImage+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 329A18581FFF5DFD008C9A2F /* UIImage+WebCache.m */; }; 329A18601FFF5DFD008C9A2F /* UIImage+Metadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 329A18581FFF5DFD008C9A2F /* UIImage+Metadata.m */; };
329A18611FFF5DFD008C9A2F /* UIImage+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 329A18581FFF5DFD008C9A2F /* UIImage+WebCache.m */; }; 329A18611FFF5DFD008C9A2F /* UIImage+Metadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 329A18581FFF5DFD008C9A2F /* UIImage+Metadata.m */; };
329A18621FFF5DFD008C9A2F /* UIImage+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 329A18581FFF5DFD008C9A2F /* UIImage+WebCache.m */; }; 329A18621FFF5DFD008C9A2F /* UIImage+Metadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 329A18581FFF5DFD008C9A2F /* UIImage+Metadata.m */; };
329A18631FFF5DFD008C9A2F /* UIImage+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 329A18581FFF5DFD008C9A2F /* UIImage+WebCache.m */; }; 329A18631FFF5DFD008C9A2F /* UIImage+Metadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 329A18581FFF5DFD008C9A2F /* UIImage+Metadata.m */; };
329A18641FFF5DFD008C9A2F /* UIImage+WebCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 329A18581FFF5DFD008C9A2F /* UIImage+WebCache.m */; }; 329A18641FFF5DFD008C9A2F /* UIImage+Metadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 329A18581FFF5DFD008C9A2F /* UIImage+Metadata.m */; };
32B9B537206ED4230026769D /* SDWebImageDownloaderConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 32B9B535206ED4230026769D /* SDWebImageDownloaderConfig.h */; settings = {ATTRIBUTES = (Public, ); }; }; 32B9B537206ED4230026769D /* SDWebImageDownloaderConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 32B9B535206ED4230026769D /* SDWebImageDownloaderConfig.h */; settings = {ATTRIBUTES = (Public, ); }; };
32B9B538206ED4230026769D /* SDWebImageDownloaderConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 32B9B535206ED4230026769D /* SDWebImageDownloaderConfig.h */; settings = {ATTRIBUTES = (Public, ); }; }; 32B9B538206ED4230026769D /* SDWebImageDownloaderConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 32B9B535206ED4230026769D /* SDWebImageDownloaderConfig.h */; settings = {ATTRIBUTES = (Public, ); }; };
32B9B539206ED4230026769D /* SDWebImageDownloaderConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 32B9B535206ED4230026769D /* SDWebImageDownloaderConfig.h */; settings = {ATTRIBUTES = (Public, ); }; }; 32B9B539206ED4230026769D /* SDWebImageDownloaderConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 32B9B535206ED4230026769D /* SDWebImageDownloaderConfig.h */; settings = {ATTRIBUTES = (Public, ); }; };
@ -1616,8 +1616,8 @@
328BB6C02082581100760D6C /* SDMemoryCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDMemoryCache.m; sourceTree = "<group>"; }; 328BB6C02082581100760D6C /* SDMemoryCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDMemoryCache.m; sourceTree = "<group>"; };
3290FA021FA478AF0047D20C /* SDImageFrame.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDImageFrame.h; sourceTree = "<group>"; }; 3290FA021FA478AF0047D20C /* SDImageFrame.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDImageFrame.h; sourceTree = "<group>"; };
3290FA031FA478AF0047D20C /* SDImageFrame.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDImageFrame.m; sourceTree = "<group>"; }; 3290FA031FA478AF0047D20C /* SDImageFrame.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDImageFrame.m; sourceTree = "<group>"; };
329A18571FFF5DFD008C9A2F /* UIImage+WebCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImage+WebCache.h"; path = "SDWebImage/UIImage+WebCache.h"; sourceTree = "<group>"; }; 329A18571FFF5DFD008C9A2F /* UIImage+Metadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+Metadata.h"; sourceTree = "<group>"; };
329A18581FFF5DFD008C9A2F /* UIImage+WebCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "UIImage+WebCache.m"; path = "SDWebImage/UIImage+WebCache.m"; sourceTree = "<group>"; }; 329A18581FFF5DFD008C9A2F /* UIImage+Metadata.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+Metadata.m"; sourceTree = "<group>"; };
32B9B535206ED4230026769D /* SDWebImageDownloaderConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDWebImageDownloaderConfig.h; sourceTree = "<group>"; }; 32B9B535206ED4230026769D /* SDWebImageDownloaderConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDWebImageDownloaderConfig.h; sourceTree = "<group>"; };
32B9B536206ED4230026769D /* SDWebImageDownloaderConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDWebImageDownloaderConfig.m; sourceTree = "<group>"; }; 32B9B536206ED4230026769D /* SDWebImageDownloaderConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDWebImageDownloaderConfig.m; sourceTree = "<group>"; };
32C0FDDF2013426C001B8F2D /* SDWebImageIndicator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDWebImageIndicator.h; sourceTree = "<group>"; }; 32C0FDDF2013426C001B8F2D /* SDWebImageIndicator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDWebImageIndicator.h; sourceTree = "<group>"; };
@ -2005,8 +2005,6 @@
4369C2851D9811BB007E863A /* WebCache Categories */ = { 4369C2851D9811BB007E863A /* WebCache Categories */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
329A18571FFF5DFD008C9A2F /* UIImage+WebCache.h */,
329A18581FFF5DFD008C9A2F /* UIImage+WebCache.m */,
321DB35F2011D4D60015D2CB /* NSButton+WebCache.h */, 321DB35F2011D4D60015D2CB /* NSButton+WebCache.h */,
321DB3602011D4D60015D2CB /* NSButton+WebCache.m */, 321DB3602011D4D60015D2CB /* NSButton+WebCache.m */,
53922D93148C56230056699D /* UIButton+WebCache.h */, 53922D93148C56230056699D /* UIButton+WebCache.h */,
@ -2141,6 +2139,8 @@
5D5B9141188EE8DD006D06BD /* NSData+ImageContentType.m */, 5D5B9141188EE8DD006D06BD /* NSData+ImageContentType.m */,
A18A6CC5172DC28500419892 /* UIImage+GIF.h */, A18A6CC5172DC28500419892 /* UIImage+GIF.h */,
A18A6CC6172DC28500419892 /* UIImage+GIF.m */, A18A6CC6172DC28500419892 /* UIImage+GIF.m */,
329A18571FFF5DFD008C9A2F /* UIImage+Metadata.h */,
329A18581FFF5DFD008C9A2F /* UIImage+Metadata.m */,
53EDFB8817623F7C00698166 /* UIImage+MultiFormat.h */, 53EDFB8817623F7C00698166 /* UIImage+MultiFormat.h */,
53EDFB8917623F7C00698166 /* UIImage+MultiFormat.m */, 53EDFB8917623F7C00698166 /* UIImage+MultiFormat.m */,
321E60BC1F38E91700405457 /* UIImage+ForceDecode.h */, 321E60BC1F38E91700405457 /* UIImage+ForceDecode.h */,
@ -2400,7 +2400,7 @@
80377C4A1F2F666300F89830 /* bit_writer_utils.h in Headers */, 80377C4A1F2F666300F89830 /* bit_writer_utils.h in Headers */,
321B37902083290E00C0EA77 /* SDImageLoadersManager.h in Headers */, 321B37902083290E00C0EA77 /* SDImageLoadersManager.h in Headers */,
323F8BE71F38EF770092B609 /* vp8li_enc.h in Headers */, 323F8BE71F38EF770092B609 /* vp8li_enc.h in Headers */,
329A185C1FFF5DFD008C9A2F /* UIImage+WebCache.h in Headers */, 329A185C1FFF5DFD008C9A2F /* UIImage+Metadata.h in Headers */,
4369C27A1D9807EC007E863A /* UIView+WebCache.h in Headers */, 4369C27A1D9807EC007E863A /* UIView+WebCache.h in Headers */,
32F21B5420788D8C0036B1D5 /* SDWebImageDownloaderRequestModifier.h in Headers */, 32F21B5420788D8C0036B1D5 /* SDWebImageDownloaderRequestModifier.h in Headers */,
80377DCC1F2F66A700F89830 /* lossless_common.h in Headers */, 80377DCC1F2F66A700F89830 /* lossless_common.h in Headers */,
@ -2516,7 +2516,7 @@
80377D501F2F66A700F89830 /* mips_macro.h in Headers */, 80377D501F2F66A700F89830 /* mips_macro.h in Headers */,
80377C291F2F666300F89830 /* thread_utils.h in Headers */, 80377C291F2F666300F89830 /* thread_utils.h in Headers */,
4314D16D1D0E0E3B004B36C9 /* SDImageCache.h in Headers */, 4314D16D1D0E0E3B004B36C9 /* SDImageCache.h in Headers */,
329A185A1FFF5DFD008C9A2F /* UIImage+WebCache.h in Headers */, 329A185A1FFF5DFD008C9A2F /* UIImage+Metadata.h in Headers */,
4314D16F1D0E0E3B004B36C9 /* NSData+ImageContentType.h in Headers */, 4314D16F1D0E0E3B004B36C9 /* NSData+ImageContentType.h in Headers */,
80377C121F2F666300F89830 /* bit_reader_inl_utils.h in Headers */, 80377C121F2F666300F89830 /* bit_reader_inl_utils.h in Headers */,
4314D1701D0E0E3B004B36C9 /* mux.h in Headers */, 4314D1701D0E0E3B004B36C9 /* mux.h in Headers */,
@ -2599,7 +2599,7 @@
80377C601F2F666400F89830 /* bit_reader_inl_utils.h in Headers */, 80377C601F2F666400F89830 /* bit_reader_inl_utils.h in Headers */,
32FDE89920888726008D7530 /* UIImage+WebP.h in Headers */, 32FDE89920888726008D7530 /* UIImage+WebP.h in Headers */,
321B37852083290E00C0EA77 /* SDImageLoader.h in Headers */, 321B37852083290E00C0EA77 /* SDImageLoader.h in Headers */,
329A185D1FFF5DFD008C9A2F /* UIImage+WebCache.h in Headers */, 329A185D1FFF5DFD008C9A2F /* UIImage+Metadata.h in Headers */,
431BB6DC1D06D2C1006A3455 /* UIButton+WebCache.h in Headers */, 431BB6DC1D06D2C1006A3455 /* UIButton+WebCache.h in Headers */,
431BB6E11D06D2C1006A3455 /* SDWebImage.h in Headers */, 431BB6E11D06D2C1006A3455 /* SDWebImage.h in Headers */,
80377E311F2F66A800F89830 /* yuv.h in Headers */, 80377E311F2F66A800F89830 /* yuv.h in Headers */,
@ -2724,7 +2724,7 @@
80377E481F2F66A800F89830 /* dsp.h in Headers */, 80377E481F2F66A800F89830 /* dsp.h in Headers */,
323F8BE91F38EF770092B609 /* vp8li_enc.h in Headers */, 323F8BE91F38EF770092B609 /* vp8li_enc.h in Headers */,
3248477A201775F600AF9E5A /* SDAnimatedImage.h in Headers */, 3248477A201775F600AF9E5A /* SDAnimatedImage.h in Headers */,
329A185E1FFF5DFD008C9A2F /* UIImage+WebCache.h in Headers */, 329A185E1FFF5DFD008C9A2F /* UIImage+Metadata.h in Headers */,
320224BB203979BA00E9F285 /* SDAnimatedImageRep.h in Headers */, 320224BB203979BA00E9F285 /* SDAnimatedImageRep.h in Headers */,
328BB6C62082581100760D6C /* SDDiskCache.h in Headers */, 328BB6C62082581100760D6C /* SDDiskCache.h in Headers */,
32FDE89420888726008D7530 /* SDImageWebPCoder.h in Headers */, 32FDE89420888726008D7530 /* SDImageWebPCoder.h in Headers */,
@ -2797,7 +2797,7 @@
321B378F2083290E00C0EA77 /* SDImageLoadersManager.h in Headers */, 321B378F2083290E00C0EA77 /* SDImageLoadersManager.h in Headers */,
431739541CDFC8B70008FEB9 /* types.h in Headers */, 431739541CDFC8B70008FEB9 /* types.h in Headers */,
323F8BE61F38EF770092B609 /* vp8li_enc.h in Headers */, 323F8BE61F38EF770092B609 /* vp8li_enc.h in Headers */,
329A185B1FFF5DFD008C9A2F /* UIImage+WebCache.h in Headers */, 329A185B1FFF5DFD008C9A2F /* UIImage+Metadata.h in Headers */,
4369C2791D9807EC007E863A /* UIView+WebCache.h in Headers */, 4369C2791D9807EC007E863A /* UIView+WebCache.h in Headers */,
32F21B5320788D8C0036B1D5 /* SDWebImageDownloaderRequestModifier.h in Headers */, 32F21B5320788D8C0036B1D5 /* SDWebImageDownloaderRequestModifier.h in Headers */,
80377D871F2F66A700F89830 /* lossless_common.h in Headers */, 80377D871F2F66A700F89830 /* lossless_common.h in Headers */,
@ -2915,7 +2915,7 @@
321E60941F38E8ED00405457 /* SDImageIOCoder.h in Headers */, 321E60941F38E8ED00405457 /* SDImageIOCoder.h in Headers */,
431738BD1CDFC2660008FEB9 /* decode.h in Headers */, 431738BD1CDFC2660008FEB9 /* decode.h in Headers */,
80377D0B1F2F66A100F89830 /* mips_macro.h in Headers */, 80377D0B1F2F66A100F89830 /* mips_macro.h in Headers */,
329A18591FFF5DFD008C9A2F /* UIImage+WebCache.h in Headers */, 329A18591FFF5DFD008C9A2F /* UIImage+Metadata.h in Headers */,
32D122302080B2EB003685A3 /* SDImageCachesManager.h in Headers */, 32D122302080B2EB003685A3 /* SDImageCachesManager.h in Headers */,
5376131A155AD0D5005750A4 /* SDWebImageDownloader.h in Headers */, 5376131A155AD0D5005750A4 /* SDWebImageDownloader.h in Headers */,
328BB6CD2082581100760D6C /* SDMemoryCache.h in Headers */, 328BB6CD2082581100760D6C /* SDMemoryCache.h in Headers */,
@ -3355,7 +3355,7 @@
00733A5E1BC4880000A5A117 /* UIImage+MultiFormat.m in Sources */, 00733A5E1BC4880000A5A117 /* UIImage+MultiFormat.m in Sources */,
80377DD01F2F66A700F89830 /* lossless_enc_neon.c in Sources */, 80377DD01F2F66A700F89830 /* lossless_enc_neon.c in Sources */,
80377DE21F2F66A700F89830 /* rescaler.c in Sources */, 80377DE21F2F66A700F89830 /* rescaler.c in Sources */,
329A18621FFF5DFD008C9A2F /* UIImage+WebCache.m in Sources */, 329A18621FFF5DFD008C9A2F /* UIImage+Metadata.m in Sources */,
80377DAD1F2F66A700F89830 /* argb_mips_dsp_r2.c in Sources */, 80377DAD1F2F66A700F89830 /* argb_mips_dsp_r2.c in Sources */,
328BB6B32081FEE500760D6C /* SDWebImageCacheSerializer.m in Sources */, 328BB6B32081FEE500760D6C /* SDWebImageCacheSerializer.m in Sources */,
00733A601BC4880000A5A117 /* UIImageView+HighlightedWebCache.m in Sources */, 00733A601BC4880000A5A117 /* UIImageView+HighlightedWebCache.m in Sources */,
@ -3380,7 +3380,7 @@
80377EA01F2F66D400F89830 /* vp8_dec.c in Sources */, 80377EA01F2F66D400F89830 /* vp8_dec.c in Sources */,
80377EA31F2F66D400F89830 /* vp8l_dec.c in Sources */, 80377EA31F2F66D400F89830 /* vp8l_dec.c in Sources */,
80377E9D1F2F66D400F89830 /* io_dec.c in Sources */, 80377E9D1F2F66D400F89830 /* io_dec.c in Sources */,
329A18601FFF5DFD008C9A2F /* UIImage+WebCache.m in Sources */, 329A18601FFF5DFD008C9A2F /* UIImage+Metadata.m in Sources */,
80377D541F2F66A700F89830 /* rescaler_mips32.c in Sources */, 80377D541F2F66A700F89830 /* rescaler_mips32.c in Sources */,
80377D331F2F66A700F89830 /* dec.c in Sources */, 80377D331F2F66A700F89830 /* dec.c in Sources */,
32EB6D92206D132E005CAEF6 /* SDAnimatedImageRep.m in Sources */, 32EB6D92206D132E005CAEF6 /* SDAnimatedImageRep.m in Sources */,
@ -3546,7 +3546,7 @@
80377ED01F2F66D500F89830 /* vp8_dec.c in Sources */, 80377ED01F2F66D500F89830 /* vp8_dec.c in Sources */,
80377ED31F2F66D500F89830 /* vp8l_dec.c in Sources */, 80377ED31F2F66D500F89830 /* vp8l_dec.c in Sources */,
80377ECD1F2F66D500F89830 /* io_dec.c in Sources */, 80377ECD1F2F66D500F89830 /* io_dec.c in Sources */,
329A18631FFF5DFD008C9A2F /* UIImage+WebCache.m in Sources */, 329A18631FFF5DFD008C9A2F /* UIImage+Metadata.m in Sources */,
80377E231F2F66A800F89830 /* rescaler_mips32.c in Sources */, 80377E231F2F66A800F89830 /* rescaler_mips32.c in Sources */,
80377E021F2F66A800F89830 /* dec.c in Sources */, 80377E021F2F66A800F89830 /* dec.c in Sources */,
32EB6D8F206D132E005CAEF6 /* SDAnimatedImageRep.m in Sources */, 32EB6D8F206D132E005CAEF6 /* SDAnimatedImageRep.m in Sources */,
@ -3736,7 +3736,7 @@
32CF1C121FA496B000004BD1 /* SDImageCoderHelper.m in Sources */, 32CF1C121FA496B000004BD1 /* SDImageCoderHelper.m in Sources */,
32B9B542206ED4230026769D /* SDWebImageDownloaderConfig.m in Sources */, 32B9B542206ED4230026769D /* SDWebImageDownloaderConfig.m in Sources */,
80377E521F2F66A800F89830 /* filters_msa.c in Sources */, 80377E521F2F66A800F89830 /* filters_msa.c in Sources */,
329A18641FFF5DFD008C9A2F /* UIImage+WebCache.m in Sources */, 329A18641FFF5DFD008C9A2F /* UIImage+Metadata.m in Sources */,
80377C821F2F666400F89830 /* filters_utils.c in Sources */, 80377C821F2F666400F89830 /* filters_utils.c in Sources */,
324DF4BF200A14DC008A84CC /* SDWebImageDefine.m in Sources */, 324DF4BF200A14DC008A84CC /* SDWebImageDefine.m in Sources */,
4397D28C1D0DDD8C00BB2784 /* UIImageView+WebCache.m in Sources */, 4397D28C1D0DDD8C00BB2784 /* UIImageView+WebCache.m in Sources */,
@ -4025,7 +4025,7 @@
43CE75801CFE9427006C64D0 /* FLAnimatedImageView.m in Sources */, 43CE75801CFE9427006C64D0 /* FLAnimatedImageView.m in Sources */,
4369C2801D9807EC007E863A /* UIView+WebCache.m in Sources */, 4369C2801D9807EC007E863A /* UIView+WebCache.m in Sources */,
80377D8B1F2F66A700F89830 /* lossless_enc_neon.c in Sources */, 80377D8B1F2F66A700F89830 /* lossless_enc_neon.c in Sources */,
329A18611FFF5DFD008C9A2F /* UIImage+WebCache.m in Sources */, 329A18611FFF5DFD008C9A2F /* UIImage+Metadata.m in Sources */,
80377D9D1F2F66A700F89830 /* rescaler.c in Sources */, 80377D9D1F2F66A700F89830 /* rescaler.c in Sources */,
328BB6B22081FEE500760D6C /* SDWebImageCacheSerializer.m in Sources */, 328BB6B22081FEE500760D6C /* SDWebImageCacheSerializer.m in Sources */,
80377D681F2F66A700F89830 /* argb_mips_dsp_r2.c in Sources */, 80377D681F2F66A700F89830 /* argb_mips_dsp_r2.c in Sources */,
@ -4195,7 +4195,7 @@
43CE757F1CFE9427006C64D0 /* FLAnimatedImageView.m in Sources */, 43CE757F1CFE9427006C64D0 /* FLAnimatedImageView.m in Sources */,
4369C27E1D9807EC007E863A /* UIView+WebCache.m in Sources */, 4369C27E1D9807EC007E863A /* UIView+WebCache.m in Sources */,
80377D011F2F66A100F89830 /* lossless_enc_neon.c in Sources */, 80377D011F2F66A100F89830 /* lossless_enc_neon.c in Sources */,
329A185F1FFF5DFD008C9A2F /* UIImage+WebCache.m in Sources */, 329A185F1FFF5DFD008C9A2F /* UIImage+Metadata.m in Sources */,
80377D131F2F66A100F89830 /* rescaler.c in Sources */, 80377D131F2F66A100F89830 /* rescaler.c in Sources */,
328BB6B02081FEE500760D6C /* SDWebImageCacheSerializer.m in Sources */, 328BB6B02081FEE500760D6C /* SDWebImageCacheSerializer.m in Sources */,
80377CDE1F2F66A100F89830 /* argb_mips_dsp_r2.c in Sources */, 80377CDE1F2F66A100F89830 /* argb_mips_dsp_r2.c in Sources */,

View File

@ -8,7 +8,7 @@
#import "SDWebImageCompat.h" #import "SDWebImageCompat.h"
// This category is provided to easily write cross-platform(AppKit/UIKit) code. For common usage, see `UIImage+WebCache`. // This category is provided to easily write cross-platform(AppKit/UIKit) code. For common usage, see `UIImage+Metadata.h`.
#if SD_MAC #if SD_MAC

View File

@ -8,7 +8,6 @@
#import "SDAnimatedImage.h" #import "SDAnimatedImage.h"
#import "NSImage+Compatibility.h" #import "NSImage+Compatibility.h"
#import "UIImage+WebCache.h"
#import "SDImageCoder.h" #import "SDImageCoder.h"
#import "SDImageCodersManager.h" #import "SDImageCodersManager.h"
#import "SDImageFrame.h" #import "SDImageFrame.h"

View File

@ -51,7 +51,7 @@
*/ */
@property (nonatomic, assign) NSUInteger maxBufferSize; @property (nonatomic, assign) NSUInteger maxBufferSize;
/** /**
Whehter or not to enable incremental image load for animated image. This is for the animated image which `sd_isIncremental` is YES (See `UIImage+WebCache.h`). If enable, animated image rendering will stop at the last frame available currently, and continue when another `setImage:` trigger, where the new animated image's `animatedImageData` should be updated from the previous one. If the `sd_isIncremental` is NO. The incremental image load stop. Whehter or not to enable incremental image load for animated image. This is for the animated image which `sd_isIncremental` is YES (See `UIImage+Metadata.h`). If enable, animated image rendering will stop at the last frame available currently, and continue when another `setImage:` trigger, where the new animated image's `animatedImageData` should be updated from the previous one. If the `sd_isIncremental` is NO. The incremental image load stop.
@note If you are confused about this description, open Chrome browser to view some large GIF images with low network speed to see the animation behavior. @note If you are confused about this description, open Chrome browser to view some large GIF images with low network speed to see the animation behavior.
@note The best practice to use incremental load is using `initWithAnimatedCoder:scale` in `SDAnimatedImage` with animated coder which conform to `SDProgressiveImageCoder` as well. Then call incremental update and incremental decode method to produce the image. @note The best practice to use incremental load is using `initWithAnimatedCoder:scale` in `SDAnimatedImage` with animated coder which conform to `SDProgressiveImageCoder` as well. Then call incremental update and incremental decode method to produce the image.
Default is YES. Set to NO to only render the static poster for incremental animated image. Default is YES. Set to NO to only render the static poster for incremental animated image.

View File

@ -10,7 +10,7 @@
#if SD_UIKIT || SD_MAC #if SD_UIKIT || SD_MAC
#import "UIImage+WebCache.h" #import "UIImage+Metadata.h"
#import "NSImage+Compatibility.h" #import "NSImage+Compatibility.h"
#import <mach/mach.h> #import <mach/mach.h>
#import <objc/runtime.h> #import <objc/runtime.h>

View File

@ -9,7 +9,7 @@
#import "SDImageAPNGCoder.h" #import "SDImageAPNGCoder.h"
#import <ImageIO/ImageIO.h> #import <ImageIO/ImageIO.h>
#import "NSData+ImageContentType.h" #import "NSData+ImageContentType.h"
#import "UIImage+WebCache.h" #import "UIImage+Metadata.h"
#import "NSImage+Compatibility.h" #import "NSImage+Compatibility.h"
#import "SDImageCoderHelper.h" #import "SDImageCoderHelper.h"
#import "SDAnimatedImageRep.h" #import "SDAnimatedImageRep.h"

View File

@ -10,7 +10,6 @@
#import "SDMemoryCache.h" #import "SDMemoryCache.h"
#import "SDDiskCache.h" #import "SDDiskCache.h"
#import "NSImage+Compatibility.h" #import "NSImage+Compatibility.h"
#import "UIImage+WebCache.h"
#import "SDImageCodersManager.h" #import "SDImageCodersManager.h"
#import "SDImageTransformer.h" #import "SDImageTransformer.h"
#import "SDImageCoderHelper.h" #import "SDImageCoderHelper.h"

View File

@ -10,7 +10,7 @@
#import "SDImageCodersManager.h" #import "SDImageCodersManager.h"
#import "SDImageCoderHelper.h" #import "SDImageCoderHelper.h"
#import "SDAnimatedImage.h" #import "SDAnimatedImage.h"
#import "UIImage+WebCache.h" #import "UIImage+Metadata.h"
UIImage * _Nullable SDImageCacheDecodeImageData(NSData * _Nonnull imageData, NSString * _Nonnull cacheKey, SDWebImageOptions options, SDWebImageContext * _Nullable context) { UIImage * _Nullable SDImageCacheDecodeImageData(NSData * _Nonnull imageData, NSString * _Nonnull cacheKey, SDWebImageOptions options, SDWebImageContext * _Nullable context) {
UIImage *image; UIImage *image;

View File

@ -245,7 +245,7 @@ static const CGFloat kDestSeemOverlap = 2.0f; // the numbers of pixels to over
if (width == 0 || height == 0) return NULL; if (width == 0 || height == 0) return NULL;
BOOL hasAlpha = [self CGImageContainsAlpha:cgImage]; BOOL hasAlpha = [self CGImageContainsAlpha:cgImage];
// iOS prefer BGRA8888 (premultiplied) or BGRX8888 bitmapInfo for screen rendering, which is same as `UIGraphicsBeginImageContext()` or `- [CALayer drawInContext:]` // iOS prefer BGRA8888 (premultiplied) or BGRX8888 bitmapInfo for screen rendering, which is same as `UIGraphicsBeginImageContext()` or `- [CALayer drawInContext:]`
// Through you can use any supported bitmapInfo (see: https://developer.apple.com/library/content/documentation/GraphicsImaging/Conceptual/drawingwithquartz2d/dq_context/dq_context.html#//apple_ref/doc/uid/TP30001066-CH203-BCIBHHBB ) and let Core Graphics reorder it when you call `CGContextDrawImage` // Though you can use any supported bitmapInfo (see: https://developer.apple.com/library/content/documentation/GraphicsImaging/Conceptual/drawingwithquartz2d/dq_context/dq_context.html#//apple_ref/doc/uid/TP30001066-CH203-BCIBHHBB ) and let Core Graphics reorder it when you call `CGContextDrawImage`
// But since our build-in coders use this bitmapInfo, this can have a little performance benefit // But since our build-in coders use this bitmapInfo, this can have a little performance benefit
CGBitmapInfo bitmapInfo = kCGBitmapByteOrder32Host; CGBitmapInfo bitmapInfo = kCGBitmapByteOrder32Host;
bitmapInfo |= hasAlpha ? kCGImageAlphaPremultipliedFirst : kCGImageAlphaNoneSkipFirst; bitmapInfo |= hasAlpha ? kCGImageAlphaPremultipliedFirst : kCGImageAlphaNoneSkipFirst;

View File

@ -13,8 +13,6 @@
#ifdef SD_WEBP #ifdef SD_WEBP
#import "SDImageWebPCoder.h" #import "SDImageWebPCoder.h"
#endif #endif
#import "NSImage+Compatibility.h"
#import "UIImage+WebCache.h"
#define LOCK(lock) dispatch_semaphore_wait(lock, DISPATCH_TIME_FOREVER); #define LOCK(lock) dispatch_semaphore_wait(lock, DISPATCH_TIME_FOREVER);
#define UNLOCK(lock) dispatch_semaphore_signal(lock); #define UNLOCK(lock) dispatch_semaphore_signal(lock);

View File

@ -11,7 +11,7 @@
@interface SDImageFrame : NSObject @interface SDImageFrame : NSObject
// This class is used for creating animated images via `animatedImageWithFrames` in `SDImageCoderHelper`. Attention if you need to specify animated images loop count, use `sd_imageLoopCount` property in `UIImage+WebCache.h`. // This class is used for creating animated images via `animatedImageWithFrames` in `SDImageCoderHelper`. Attention if you need to specify animated images loop count, use `sd_imageLoopCount` property in `UIImage+Metadata.h`.
/** /**
The image of current frame. You should not set an animated image. The image of current frame. You should not set an animated image.

View File

@ -8,7 +8,7 @@
#import "SDImageGIFCoder.h" #import "SDImageGIFCoder.h"
#import "NSImage+Compatibility.h" #import "NSImage+Compatibility.h"
#import "UIImage+WebCache.h" #import "UIImage+Metadata.h"
#import <ImageIO/ImageIO.h> #import <ImageIO/ImageIO.h>
#import "NSData+ImageContentType.h" #import "NSData+ImageContentType.h"
#import "SDImageCoderHelper.h" #import "SDImageCoderHelper.h"

View File

@ -11,7 +11,7 @@
#import "SDImageCodersManager.h" #import "SDImageCodersManager.h"
#import "SDImageCoderHelper.h" #import "SDImageCoderHelper.h"
#import "SDAnimatedImage.h" #import "SDAnimatedImage.h"
#import "UIImage+WebCache.h" #import "UIImage+Metadata.h"
#import "objc/runtime.h" #import "objc/runtime.h"
static void * SDImageLoaderProgressiveCoderKey = &SDImageLoaderProgressiveCoderKey; static void * SDImageLoaderProgressiveCoderKey = &SDImageLoaderProgressiveCoderKey;

View File

@ -27,7 +27,7 @@ FOUNDATION_EXPORT CGFloat SDImageScaleFactorForKey(NSString * _Nullable key);
/** /**
Scale the image with the scale factor for the specify key. If no need to scale, return the original image. Scale the image with the scale factor for the specify key. If no need to scale, return the original image.
This works for `UIImage`(UIKit) or `NSImage`(AppKit). And this function also preserve the associated value in `UIImage+WebCache`. This works for `UIImage`(UIKit) or `NSImage`(AppKit). And this function also preserve the associated value in `UIImage+Metadata.h`.
@note This is actually a convenience function, which firstlly call `SDImageScaleFactorForKey` and then call `SDScaledImageForScaleFactor`, kept for backward compatibility. @note This is actually a convenience function, which firstlly call `SDImageScaleFactorForKey` and then call `SDScaledImageForScaleFactor`, kept for backward compatibility.
@param key The image cache key @param key The image cache key
@ -38,7 +38,7 @@ FOUNDATION_EXPORT UIImage * _Nullable SDScaledImageForKey(NSString * _Nullable k
/** /**
Scale the image with the scale factor. If no need to scale, return the original image. Scale the image with the scale factor. If no need to scale, return the original image.
This works for `UIImage`(UIKit) or `NSImage`(AppKit). And this function also preserve the associated value in `UIImage+WebCache`. This works for `UIImage`(UIKit) or `NSImage`(AppKit). And this function also preserve the associated value in `UIImage+Metadata.h`.
@param scale The image scale factor @param scale The image scale factor
@param image The image @param image The image

View File

@ -7,7 +7,7 @@
*/ */
#import "SDWebImageDefine.h" #import "SDWebImageDefine.h"
#import "UIImage+WebCache.h" #import "UIImage+Metadata.h"
#import "NSImage+Compatibility.h" #import "NSImage+Compatibility.h"
#pragma mark - Image scale #pragma mark - Image scale

View File

@ -9,7 +9,7 @@
#import "SDWebImageManager.h" #import "SDWebImageManager.h"
#import "SDImageCache.h" #import "SDImageCache.h"
#import "SDWebImageDownloader.h" #import "SDWebImageDownloader.h"
#import "UIImage+WebCache.h" #import "UIImage+Metadata.h"
#import "SDWebImageError.h" #import "SDWebImageError.h"
#define LOCK(lock) dispatch_semaphore_wait(lock, DISPATCH_TIME_FOREVER); #define LOCK(lock) dispatch_semaphore_wait(lock, DISPATCH_TIME_FOREVER);

View File

@ -8,7 +8,7 @@
#import "SDWebImageCompat.h" #import "SDWebImageCompat.h"
@interface UIImage (WebCache) @interface UIImage (Metadata)
/** /**
* UIKit: * UIKit:

View File

@ -6,13 +6,13 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
#import "UIImage+WebCache.h" #import "UIImage+Metadata.h"
#import "NSImage+Compatibility.h" #import "NSImage+Compatibility.h"
#import "objc/runtime.h" #import "objc/runtime.h"
#if SD_UIKIT || SD_WATCH #if SD_UIKIT || SD_WATCH
@implementation UIImage (WebCache) @implementation UIImage (Metadata)
- (NSUInteger)sd_imageLoopCount { - (NSUInteger)sd_imageLoopCount {
NSUInteger imageLoopCount = 0; NSUInteger imageLoopCount = 0;
@ -47,7 +47,7 @@
#if SD_MAC #if SD_MAC
@implementation NSImage (WebCache) @implementation NSImage (Metadata)
- (NSUInteger)sd_imageLoopCount { - (NSUInteger)sd_imageLoopCount {
NSUInteger imageLoopCount = 0; NSUInteger imageLoopCount = 0;

View File

@ -11,15 +11,18 @@
#import <Accelerate/Accelerate.h> #import <Accelerate/Accelerate.h>
#if SD_UIKIT || SD_MAC #if SD_UIKIT || SD_MAC
#import <CoreImage/CoreImage.h> #import <CoreImage/CoreImage.h>
#import "objc/runtime.h"
#endif #endif
#if SD_MAC #if SD_MAC
static void *kNSGraphicsContextScaleFactorKey;
static CGContextRef SDCGContextCreateBitmapContext(CGSize size, BOOL opaque, CGFloat scale) { static CGContextRef SDCGContextCreateBitmapContext(CGSize size, BOOL opaque, CGFloat scale) {
size_t width = ceil(size.width * scale); size_t width = ceil(size.width * scale);
size_t height = ceil(size.height * scale); size_t height = ceil(size.height * scale);
if (width < 1 || height < 1) return NULL; if (width < 1 || height < 1) return NULL;
//pre-multiplied BGRA, 8-bits per component, as Apple's doc //pre-multiplied BGRA for non-opaque, BGRX for opaque, 8-bits per component, as Apple's doc
CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB(); CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
CGImageAlphaInfo alphaInfo = kCGBitmapByteOrder32Host | (opaque ? kCGImageAlphaNoneSkipFirst : kCGImageAlphaPremultipliedFirst); CGImageAlphaInfo alphaInfo = kCGBitmapByteOrder32Host | (opaque ? kCGImageAlphaNoneSkipFirst : kCGImageAlphaPremultipliedFirst);
CGContextRef context = CGBitmapContextCreate(NULL, width, height, 8, 0, space, kCGBitmapByteOrderDefault | alphaInfo); CGContextRef context = CGBitmapContextCreate(NULL, width, height, 8, 0, space, kCGBitmapByteOrderDefault | alphaInfo);
@ -46,6 +49,7 @@ static void SDGraphicsBeginImageContextWithOptions(CGSize size, BOOL opaque, CGF
return; return;
} }
NSGraphicsContext *graphicsContext = [NSGraphicsContext graphicsContextWithCGContext:context flipped:NO]; NSGraphicsContext *graphicsContext = [NSGraphicsContext graphicsContextWithCGContext:context flipped:NO];
objc_setAssociatedObject(graphicsContext, &kNSGraphicsContextScaleFactorKey, @(scale), OBJC_ASSOCIATION_RETAIN);
CGContextRelease(context); CGContextRelease(context);
[NSGraphicsContext saveGraphicsState]; [NSGraphicsContext saveGraphicsState];
NSGraphicsContext.currentContext = graphicsContext; NSGraphicsContext.currentContext = graphicsContext;
@ -72,22 +76,22 @@ static UIImage * SDGraphicsGetImageFromCurrentImageContext(void) {
#if SD_UIKIT || SD_WATCH #if SD_UIKIT || SD_WATCH
return UIGraphicsGetImageFromCurrentImageContext(); return UIGraphicsGetImageFromCurrentImageContext();
#else #else
CGContextRef context = SDGraphicsGetCurrentContext(); NSGraphicsContext *context = NSGraphicsContext.currentContext;
if (!context) { CGContextRef contextRef = context.CGContext;
if (!contextRef) {
return nil; return nil;
} }
CGImageRef imageRef = CGBitmapContextCreateImage(context); CGImageRef imageRef = CGBitmapContextCreateImage(contextRef);
if (!imageRef) { if (!imageRef) {
return nil; return nil;
} }
CGAffineTransform transform = CGContextGetCTM(context); CGFloat scale = 0;
CGFloat xs = transform.a; NSNumber *scaleFactor = objc_getAssociatedObject(context, &kNSGraphicsContextScaleFactorKey);
CGFloat ys = transform.d; if ([scaleFactor isKindOfClass:[NSNumber class]]) {
CGFloat scale; scale = scaleFactor.doubleValue;
if (xs == ys && xs > 0) { }
scale = xs; if (!scale) {
} else { // reset to the scale factor of the devices main screen if scale is 0.
// Protect if x/y axis scale factor not equal
scale = [NSScreen mainScreen].backingScaleFactor; scale = [NSScreen mainScreen].backingScaleFactor;
} }
NSImage *image = [[NSImage alloc] initWithCGImage:imageRef scale:scale orientation:kCGImagePropertyOrientationUp]; NSImage *image = [[NSImage alloc] initWithCGImage:imageRef scale:scale orientation:kCGImagePropertyOrientationUp];

View File

@ -11,7 +11,7 @@
#import "SDImageWebPCoder.h" #import "SDImageWebPCoder.h"
#import "SDImageCoderHelper.h" #import "SDImageCoderHelper.h"
#import "NSImage+Compatibility.h" #import "NSImage+Compatibility.h"
#import "UIImage+WebCache.h" #import "UIImage+Metadata.h"
#import "UIImage+ForceDecode.h" #import "UIImage+ForceDecode.h"
#if __has_include(<webp/decode.h>) && __has_include(<webp/encode.h>) && __has_include(<webp/demux.h>) && __has_include(<webp/mux.h>) #if __has_include(<webp/decode.h>) && __has_include(<webp/encode.h>) && __has_include(<webp/demux.h>) && __has_include(<webp/mux.h>)
#import <webp/decode.h> #import <webp/decode.h>

View File

@ -41,7 +41,7 @@ FOUNDATION_EXPORT const unsigned char WebImageVersionString[];
#import <SDWebImage/UIButton+WebCache.h> #import <SDWebImage/UIButton+WebCache.h>
#import <SDWebImage/SDWebImagePrefetcher.h> #import <SDWebImage/SDWebImagePrefetcher.h>
#import <SDWebImage/UIView+WebCacheOperation.h> #import <SDWebImage/UIView+WebCacheOperation.h>
#import <SDWebImage/UIImage+WebCache.h> #import <SDWebImage/UIImage+Metadata.h>
#import <SDWebImage/UIImage+MultiFormat.h> #import <SDWebImage/UIImage+MultiFormat.h>
#import <SDWebImage/SDWebImageOperation.h> #import <SDWebImage/SDWebImageOperation.h>
#import <SDWebImage/SDWebImageDownloader.h> #import <SDWebImage/SDWebImageDownloader.h>