Backport: Reduce casts by moving casting from char* to UInt8* into QuartzTextLayout::SetText

and adding helper TextStyleFromFont to cast from Font to QuartzTextStyle.

Backport of changeset 6729:2d72313a7d6d.

1 files changed, 3 insertions, 3 deletions

diff --git a/cocoa/QuartzTextLayout.h b/cocoa/QuartzTextLayout.h
index 33869ae6e..0f813f301 100644
--- a/cocoa/QuartzTextLayout.h
+++ b/cocoa/QuartzTextLayout.h
@@ -42,9 +42,9 @@ public:
 		}
     }
 
-    inline void setText( const UInt8* buffer, size_t byteLength, CFStringEncoding encoding, const QuartzTextStyle& r )
-    {
-		CFStringRef str = CFStringCreateWithBytes( NULL, buffer, byteLength, encoding, false );
+	void setText(const char *buffer, size_t byteLength, CFStringEncoding encoding, const QuartzTextStyle &r) {
+		const UInt8 *puiBuffer = reinterpret_cast<const UInt8 *>(buffer);
+		CFStringRef str = CFStringCreateWithBytes(NULL, puiBuffer, byteLength, encoding, false);
         if (!str)
             return;