Skip to content

Commit 1b75481

Browse files
authored
Merge pull request #6802 from moiseev/no-pi-warning
2 parents 5c6a694 + b2efca5 commit 1b75481

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

stdlib/public/SDK/Foundation/AffineTransform.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ public struct AffineTransform : ReferenceConvertible, Hashable, CustomStringConv
124124
[ 0 0 1 ]
125125
*/
126126
public init(rotationByDegrees angle: CGFloat) {
127-
let α = Double(angle) * M_PI / 180.0
128-
self.init(rotationByRadians: CGFloat(α))
127+
let α = angle * .pi / 180.0
128+
self.init(rotationByRadians: α)
129129
}
130130

131131
/**
@@ -153,8 +153,8 @@ public struct AffineTransform : ReferenceConvertible, Hashable, CustomStringConv
153153
[ 0 0 1 ]
154154
*/
155155
public mutating func rotate(byDegrees angle: CGFloat) {
156-
let α = Double(angle) * M_PI / 180.0
157-
return rotate(byRadians: CGFloat(α))
156+
let α = angle * .pi / 180.0
157+
return rotate(byRadians: α)
158158
}
159159

160160
/**

test/stdlib/TestAffineTransform.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,19 +169,19 @@ class TestAffineTransform : TestAffineTransformSuper {
169169
checkPointTransformation(noop, point: point, expectedPoint: point)
170170

171171
var tenEighty = AffineTransform.identity
172-
tenEighty.rotate(byRadians: CGFloat(6 * M_PI))
172+
tenEighty.rotate(byRadians: 6 * .pi)
173173
checkPointTransformation(tenEighty, point: point, expectedPoint: point)
174174

175175
var rotateCounterClockwise = AffineTransform.identity
176-
rotateCounterClockwise.rotate(byRadians: CGFloat(M_PI_2))
176+
rotateCounterClockwise.rotate(byRadians: .pi / 2)
177177
checkPointTransformation(rotateCounterClockwise, point: point, expectedPoint: NSPoint(x: CGFloat(-10.0), y: CGFloat(10.0)))
178178

179179
var rotateClockwise = AffineTransform.identity
180-
rotateClockwise.rotate(byRadians: CGFloat(-M_PI_2))
180+
rotateClockwise.rotate(byRadians: -.pi / 2)
181181
checkPointTransformation(rotateClockwise, point: point, expectedPoint: NSPoint(x: CGFloat(10.0), y: CGFloat(-10.0)))
182182

183183
var reflectAboutOrigin = AffineTransform.identity
184-
reflectAboutOrigin.rotate(byRadians: CGFloat(M_PI))
184+
reflectAboutOrigin.rotate(byRadians: .pi)
185185
checkPointTransformation(reflectAboutOrigin, point: point, expectedPoint: NSPoint(x: CGFloat(-10.0), y: CGFloat(-10.0)))
186186
}
187187

0 commit comments

Comments
 (0)