Skip to content

Commit a207e5f

Browse files
authored
Merge pull request #5 from SDWebImage/override_metadata_custom_class
Override the UIImage+Metadata category method to provide the correct value for YYImage
2 parents b63ef65 + 1d994d6 commit a207e5f

File tree

5 files changed

+46
-5
lines changed

5 files changed

+46
-5
lines changed

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "SDWebImage/SDWebImage" ~> 5.4
1+
github "SDWebImage/SDWebImage" ~> 5.6
22
github "ibireme/YYCache" ~> 1.0
33
github "ibireme/YYImage" ~> 1.0

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "SDWebImage/SDWebImage" "5.4.0"
1+
github "SDWebImage/SDWebImage" "5.6.0"
22
github "ibireme/YYCache" "1.0.4"
33
github "ibireme/YYImage" "1.0.4"

Example/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
PODS:
22
- Expecta (1.0.6)
3-
- SDWebImage/Core (5.4.0)
3+
- SDWebImage/Core (5.6.0)
44
- SDWebImageYYPlugin (0.3.0):
55
- SDWebImage/Core (~> 5.4)
66
- SDWebImageYYPlugin/YYCache (= 0.3.0)
@@ -34,7 +34,7 @@ EXTERNAL SOURCES:
3434

3535
SPEC CHECKSUMS:
3636
Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
37-
SDWebImage: 5bf6aec6481ae2a062bdc59f9d6c1d1e552090e0
37+
SDWebImage: 21b19f56b4226cdfe3aefe4e6848dc43ed129a86
3838
SDWebImageYYPlugin: f6c1af162fb075efe5918d8caedee1f3d17c197e
3939
YYCache: 8105b6638f5e849296c71f331ff83891a4942952
4040
YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54

SDWebImageYYPlugin.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ TODO: Add long description of the pod here.
3131
s.source_files = 'SDWebImageYYPlugin/Module/SDWebImageYYPlugin.h'
3232
s.module_map = 'SDWebImageYYPlugin/Module/SDWebImageYYPlugin.modulemap'
3333

34-
s.dependency 'SDWebImage/Core', '~> 5.4'
34+
s.dependency 'SDWebImage/Core', '~> 5.6'
3535

3636
s.subspec 'YYCache' do |ss|
3737
ss.dependency 'YYCache'

SDWebImageYYPlugin/Classes/YYImage/YYImageBridge/YYImage+SDAdditions.m

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,44 @@ - (NSUInteger)sd_memoryCost {
6565

6666
@end
6767

68+
@implementation YYImage (Metadata)
69+
70+
- (BOOL)sd_isAnimated {
71+
return YES;
72+
}
73+
74+
- (NSUInteger)sd_imageLoopCount {
75+
return self.animatedImageLoopCount;
76+
}
77+
78+
- (void)setSd_imageLoopCount:(NSUInteger)sd_imageLoopCount {
79+
return;
80+
}
81+
82+
- (SDImageFormat)sd_imageFormat {
83+
switch (self.animatedImageType) {
84+
case YYImageTypeJPEG:
85+
case YYImageTypeJPEG2000:
86+
return SDImageFormatJPEG;
87+
case YYImageTypePNG:
88+
return SDImageFormatPNG;
89+
case YYImageTypeGIF:
90+
return SDImageFormatGIF;
91+
case YYImageTypeTIFF:
92+
return SDImageFormatTIFF;
93+
case YYImageTypeWebP:
94+
return SDImageFormatWebP;
95+
default:
96+
return SDImageFormatUndefined;
97+
}
98+
}
99+
100+
- (void)setSd_imageFormat:(SDImageFormat)sd_imageFormat {
101+
return;
102+
}
103+
104+
- (BOOL)sd_isVector {
105+
return NO;
106+
}
107+
108+
@end

0 commit comments

Comments
 (0)