Merge branch '5.2.x'

# Conflicts:
#	SDWebImage/Core/SDAnimatedImageView.m

CHANGELOG.md

@@ -1,3 +1,16 @@
+## [5.2 Patch, on Oct 27th, 2019](https://github.com/rs/SDWebImage/releases/tag/5.2.5)
+See [all tickets marked for the 5.2.5 release](https://github.com/SDWebImage/SDWebImage/milestone/50)
+
+### Fixes
+- Fix macOS SDWebImageIndicator center layout issue when indicator was initialized with 0 frame #2875
+
+## [5.2 Patch, on Oct 27th, 2019](https://github.com/rs/SDWebImage/releases/tag/5.2.4)
+See [all tickets marked for the 5.2.4 release](https://github.com/SDWebImage/SDWebImage/milestone/49)
+
+### Fixes
+- Fix the regression issue that SDAnimatedImageView on macOS will change the wrong duration speed when pause and resume again #2873
+- Fix SDAnimatedImage on macOS use extra animates property check, which is not intuitive and cause extra setup before usage #2874
+
 ## [5.2 Patch, on Oct 9th, 2019](https://github.com/rs/SDWebImage/releases/tag/5.2.3)
 See [all tickets marked for the 5.2.3 release](https://github.com/SDWebImage/SDWebImage/milestone/48)
 

SDWebImage.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'SDWebImage'
-  s.version = '5.2.3'
+  s.version = '5.2.5'
 
   s.osx.deployment_target = '10.10'
   s.ios.deployment_target = '8.0'

SDWebImage/Core/SDAnimatedImageView.m

@@ -480,7 +480,7 @@ static NSUInteger SDDeviceFreeMemory() {
 - (void)updateShouldAnimate
 {
 #if SD_MAC
-    BOOL isVisible = self.window && self.superview && ![self isHidden] && self.alphaValue > 0.0 && self.animates;
+    BOOL isVisible = self.window && self.superview && ![self isHidden] && self.alphaValue > 0.0;
 #else
     BOOL isVisible = self.window && self.superview && ![self isHidden] && self.alpha > 0.0;
 #endif

SDWebImage/Core/UIView+WebCache.m

@@ -324,9 +324,7 @@ const int64_t SDWebImageProgressUnitCountUnknown = 1LL;
     }
     // Center the indicator view
 #if SD_MAC
-    CGPoint center = CGPointMake(NSMidX(self.bounds), NSMidY(self.bounds));
-    NSRect frame = view.frame;
-    view.frame = NSMakeRect(center.x - NSMidX(frame), center.y - NSMidY(frame), NSWidth(frame), NSHeight(frame));
+    [view setFrameOrigin:CGPointMake(round((NSWidth(self.bounds) - NSWidth(view.frame)) / 2), round((NSHeight(self.bounds) - NSHeight(view.frame)) / 2))];
 #else
     view.center = CGPointMake(CGRectGetMidX(self.bounds), CGRectGetMidY(self.bounds));
 #endif

WebImage/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.2.3</string>
+	<string>5.2.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.2.3</string>
+	<string>5.2.5</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>