From 684601bf851237e32fa16aca90c9b8ae0bd46ddd Mon Sep 17 00:00:00 2001 From: Syo Ikeda Date: Sun, 15 Jan 2017 23:16:17 +0900 Subject: [PATCH] [AffineTransform] Replace `M_PI` with `CGFloat.pi` --- Foundation/NSAffineTransform.swift | 10 +++++----- TestFoundation/TestNSAffineTransform.swift | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Foundation/NSAffineTransform.swift b/Foundation/NSAffineTransform.swift index 601c715058..532c48d41f 100644 --- a/Foundation/NSAffineTransform.swift +++ b/Foundation/NSAffineTransform.swift @@ -117,8 +117,8 @@ public struct AffineTransform : ReferenceConvertible, Hashable, CustomStringConv [ 0 0 1 ] */ public init(rotationByDegrees angle: CGFloat) { - let α = Double(angle) * M_PI / 180.0 - self.init(rotationByRadians: CGFloat(α)) + let α = angle * .pi / 180.0 + self.init(rotationByRadians: α) } /** @@ -145,8 +145,8 @@ public struct AffineTransform : ReferenceConvertible, Hashable, CustomStringConv [ 0 0 1 ] */ public mutating func rotate(byDegrees angle: CGFloat) { - let α = Double(angle) * M_PI / 180.0 - return rotate(byRadians: CGFloat(α)) + let α = angle * .pi / 180.0 + return rotate(byRadians: α) } /** @@ -413,4 +413,4 @@ extension NSAffineTransform : _StructTypeBridgeable { public func _bridgeToSwift() -> AffineTransform { return AffineTransform._unconditionallyBridgeFromObjectiveC(self) } -} \ No newline at end of file +} diff --git a/TestFoundation/TestNSAffineTransform.swift b/TestFoundation/TestNSAffineTransform.swift index c42e6188de..914fbd7326 100644 --- a/TestFoundation/TestNSAffineTransform.swift +++ b/TestFoundation/TestNSAffineTransform.swift @@ -173,19 +173,19 @@ class TestNSAffineTransform : XCTestCase { checkPointTransformation(noop, point: point, expectedPoint: point) let tenEighty = NSAffineTransform() - tenEighty.rotate(byRadians: CGFloat(6 * M_PI)) + tenEighty.rotate(byRadians: 6 * .pi) checkPointTransformation(tenEighty, point: point, expectedPoint: point) let rotateCounterClockwise = NSAffineTransform() - rotateCounterClockwise.rotate(byRadians: CGFloat(M_PI_2)) + rotateCounterClockwise.rotate(byRadians: .pi / 2) checkPointTransformation(rotateCounterClockwise, point: point, expectedPoint: NSPoint(x: CGFloat(-10.0), y: CGFloat(10.0))) let rotateClockwise = NSAffineTransform() - rotateClockwise.rotate(byRadians: CGFloat(-M_PI_2)) + rotateClockwise.rotate(byRadians: -.pi / 2) checkPointTransformation(rotateClockwise, point: point, expectedPoint: NSPoint(x: CGFloat(10.0), y: CGFloat(-10.0))) let reflectAboutOrigin = NSAffineTransform() - reflectAboutOrigin.rotate(byRadians: CGFloat(M_PI)) + reflectAboutOrigin.rotate(byRadians: .pi) checkPointTransformation(reflectAboutOrigin, point: point, expectedPoint: NSPoint(x: CGFloat(-10.0), y: CGFloat(-10.0))) }