Skip to content

[AffineTransform] Replace M_PI with CGFloat.pi #797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 16, 2017
Merged

[AffineTransform] Replace M_PI with CGFloat.pi #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Foundation/NSAffineTransform.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: α)
}

/**
Expand All @@ -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: α)
}

/**
Expand Down Expand Up @@ -413,4 +413,4 @@ extension NSAffineTransform : _StructTypeBridgeable {
public func _bridgeToSwift() -> AffineTransform {
return AffineTransform._unconditionallyBridgeFromObjectiveC(self)
}
}
}
8 changes: 4 additions & 4 deletions TestFoundation/TestNSAffineTransform.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
}

Expand Down