Update the podspec && carthage to use the latest SVGKit release

Author: dreampiggy

Cartfile

@@ -1,2 +1,2 @@
 github "SDWebImage/SDWebImage" >= 5.0.0-beta3
-github "SVGKit/SVGKit" "2.x"
+github "SVGKit/SVGKit" >= 2.1

Example/Podfile.lock

@@ -7,8 +7,8 @@ PODS:
  - CocoaLumberjack/Default
  - SDWebImage/Core (5.0.0-beta3)
  - SDWebImageSVGCoder (0.1.0):
- - SDWebImage/Core (>= 5.0.0-beta2)
- - SVGKit (>= 2.x)
+ - SDWebImage/Core (>= 5.0.0-beta3)
+ - SVGKit (>= 2.1)
  - SVGKit (2.1.0):
  - CocoaLumberjack (~> 3.0)
 
@@ -31,7 +31,7 @@ CHECKOUT OPTIONS:
 SPEC CHECKSUMS:
  CocoaLumberjack: db7cc9e464771f12054c22ff6947c5a58d43a0fd
  SDWebImage: e52654ceef9fdc19f4c612d64a5b6d3f05dd81a4
- SDWebImageSVGCoder: a39ffaef7618b138d18eef8e3c49c96a3637fbe2
+ SDWebImageSVGCoder: adcf27c5fe8424441f515f54409c64b57dbaed1b
  SVGKit: 8a2fc74258bdb2abb54d3b65f3dd68b0277a9c4d
 
 PODFILE CHECKSUM: dc5153f27ba2a6dd43c49d8e0100b34b78f46730

Example/SDWebImageSVGCoder/SDViewController.m

@@ -37,7 +37,6 @@ - (void)viewDidLoad
 
  // `SVGKFastImageView`, draw SVG as bitmap dynamically when size changed.
  SVGKImageView *imageView2 = [[SVGKFastImageView alloc] initWithFrame:CGRectMake(0, screenSize.height / 2, screenSize.width, screenSize.height / 2)];
- imageView2.sd_adjustContentMode = YES;
  imageView2.clipsToBounds = YES;
 
  // `UIImageView`, draw SVG as bitmap image with fixed size, like PNG.

SDWebImageSVGCoder.podspec

@@ -33,6 +33,6 @@ TODO: Add long description of the pod here.
  s.source_files = 'SDWebImageSVGCoder/Classes/**/*', 'SDWebImageSVGCoder/Module/SDWebImageSVGCoder.h'
  s.module_map = 'SDWebImageSVGCoder/Module/SDWebImageSVGCoder.modulemap'
 
- s.dependency 'SDWebImage/Core', '>= 5.0.0-beta2'
- s.dependency 'SVGKit', '>= 2.x'
+ s.dependency 'SDWebImage/Core', '>= 5.0.0-beta3'
+ s.dependency 'SVGKit', '>= 2.1'
 end

SDWebImageSVGCoder/Classes/SDWebImageSVGCoderDefine.m

@@ -24,8 +24,6 @@ void SDAdjustSVGContentMode(SVGKImage * svgImage, UIViewContentMode contentMode,
  CGFloat hScale = viewSize.height / imageSize.height;
  CGFloat imageAspect = imageSize.width / imageSize.height;
  CGFloat viewAspect = viewSize.width / viewSize.height;
- CGFloat smallestScaleUp = MIN(wScale, hScale);
- CGFloat biggestScaleDown = MAX(wScale, hScale);
  CGFloat xPosition;
  CGFloat yPosition;
 
@@ -36,10 +34,24 @@ void SDAdjustSVGContentMode(SVGKImage * svgImage, UIViewContentMode contentMode,
  }
  break;
  case UIViewContentModeScaleAspectFit: {
- CGFloat scale = smallestScaleUp < 1.0f ? biggestScaleDown : smallestScaleUp;
+ CGFloat scale;
+ if (imageAspect > viewAspect) {
+ // scale width
+ scale = wScale;
+ } else {
+ // scale height
+ scale = hScale;
+ }
  CGSize targetSize = CGSizeApplyAffineTransform(imageSize, CGAffineTransformMakeScale(scale, scale));
- xPosition = (viewSize.width - targetSize.width) / 2;
- yPosition = (viewSize.height - targetSize.height) / 2;
+ if (imageAspect > viewAspect) {
+ // need center y as well
+ xPosition = 0;
+ yPosition = ABS(targetSize.height - viewSize.height) / 2;
+ } else {
+ // need center x as well
+ xPosition = ABS(targetSize.width - viewSize.width) / 2;
+ yPosition = 0;
+ }
  svgImage.size = targetSize;
  svgImage.DOMTree.viewport = SVGRectMake(xPosition, yPosition, targetSize.width, targetSize.height);
  // masksToBounds to clip the sublayer which beyond the viewport to match `UIImageView` behavior
@@ -59,10 +71,10 @@ void SDAdjustSVGContentMode(SVGKImage * svgImage, UIViewContentMode contentMode,
  if (imageAspect < viewAspect) {
  // need center y as well
  xPosition = 0;
- yPosition = (targetSize.height - viewSize.height) / 2;
+ yPosition = ABS(targetSize.height - viewSize.height) / 2;
  } else {
  // need center x as well
- xPosition = (targetSize.width - viewSize.width) / 2;
+ xPosition = ABS(targetSize.width - viewSize.width) / 2;
  yPosition = 0;
  }
  svgImage.size = targetSize;