aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/base/Osx.cpp8
-rw-r--r--src/platform/graphics/quartz/TextLayout.cpp2
2 files changed, 9 insertions, 1 deletions
diff --git a/src/base/Osx.cpp b/src/base/Osx.cpp
index 6b8d0bd9..8dc70598 100644
--- a/src/base/Osx.cpp
+++ b/src/base/Osx.cpp
@@ -18,4 +18,12 @@ String FromCFStringRef(CFStringRef string) {
return result;
}
+
+CFRange ToCFRange(const Range& range) {
+ return CFRangeMake(range.position, range.count);
+}
+
+Range FromCFRange(const CFRange& range) {
+ return Range(range.location, range.length);
+}
} // namespace cru
diff --git a/src/platform/graphics/quartz/TextLayout.cpp b/src/platform/graphics/quartz/TextLayout.cpp
index 7b3e6da8..1be52c48 100644
--- a/src/platform/graphics/quartz/TextLayout.cpp
+++ b/src/platform/graphics/quartz/TextLayout.cpp
@@ -406,7 +406,7 @@ std::vector<CGRect> OsxCTTextLayout::DoTextRangeRect(
auto line = lines_[i];
auto line_origin = line_origins_[i];
- Range range = Range::FromCFRange(CTLineGetStringRange(line));
+ Range range = FromCFRange(CTLineGetStringRange(line));
range = range.CoerceInto(r.GetStart(), r.GetEnd());
if (range.count) {