aboutsummaryrefslogtreecommitdiff
path: root/src/osx/graphics/quartz/Convert.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/osx/graphics/quartz/Convert.cpp')
-rw-r--r--src/osx/graphics/quartz/Convert.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/osx/graphics/quartz/Convert.cpp b/src/osx/graphics/quartz/Convert.cpp
index 9dcb29db..a6892da9 100644
--- a/src/osx/graphics/quartz/Convert.cpp
+++ b/src/osx/graphics/quartz/Convert.cpp
@@ -13,15 +13,20 @@ String Convert(CFStringRef string) {
kCFStringEncodingUTF16, 0);
auto l = CFDataGetLength(d);
- auto s = String::FromUtf16(
- reinterpret_cast<const std::uint16_t*>(CFDataGetBytePtr(d)),
- CFDataGetLength(d) / 2);
+ auto s = String(reinterpret_cast<const std::uint16_t*>(CFDataGetBytePtr(d)),
+ CFDataGetLength(d) / 2);
CFRelease(d);
return s;
}
+CGPoint Convert(const Point& point) { return CGPoint{point.x, point.y}; }
+Point Convert(const CGPoint& point) { return Point(point.x, point.y); }
+
+CGSize Convert(const Size& size) { return CGSize{size.width, size.height}; }
+Size Convert(const CGSize& size) { return Size(size.width, size.height); }
+
CGAffineTransform Convert(const Matrix& matrix) {
return CGAffineTransformMake(matrix.m11, matrix.m12, matrix.m21, matrix.m22,
matrix.m31, matrix.m32);