Skip to content

S
skiko
Unverified Commit 210424c7 authored by Oleksandr Karpovich's avatar Oleksandr Karpovich Committed by GitHub
Browse files
Options

fix Shaper functions (#486)

parent f7831c1e
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
skiko/src/commonMain/kotlin/org/jetbrains/skia/shaper/Shaper.kt
View file @ 210424c7
...@@ -105,10 +105,11 @@ class Shaper internal constructor(ptr: NativePointer) : Managed(ptr, _FinalizerH ...@@ -105,10 +105,11 @@ class Shaper internal constructor(ptr: NativePointer) : Managed(ptr, _FinalizerH
fun shape(text: String?, font: Font?, opts: ShapingOptions, width: Float, offset: Point): TextBlob? { fun shape(text: String?, font: Font?, opts: ShapingOptions, width: Float, offset: Point): TextBlob? {
return try { return try {
Stats.onNativeCall() Stats.onNativeCall()
val managedString = ManagedString(text)
val ptr = interopScope { val ptr = interopScope {
_nShapeBlob( _nShapeBlob(
_ptr, _ptr,
ManagedString(text)._ptr, managedString._ptr,
getPtr(font), getPtr(font),
optsFeaturesLen = opts.features?.size ?: 0, optsFeaturesLen = opts.features?.size ?: 0,
optsFeaturesIntArray = arrayOfFontFeaturesToInterop(opts.features), optsFeaturesIntArray = arrayOfFontFeaturesToInterop(opts.features),
...@@ -191,11 +192,12 @@ class Shaper internal constructor(ptr: NativePointer) : Managed(ptr, _FinalizerH ...@@ -191,11 +192,12 @@ class Shaper internal constructor(ptr: NativePointer) : Managed(ptr, _FinalizerH
fun shapeLine(text: String?, font: Font?, opts: ShapingOptions): TextLine { fun shapeLine(text: String?, font: Font?, opts: ShapingOptions): TextLine {
return try { return try {
Stats.onNativeCall() Stats.onNativeCall()
val managedString = ManagedString(text)
interopScope { interopScope {
TextLine( TextLine(
_nShapeLine( _nShapeLine(
_ptr, _ptr,
ManagedString(text)._ptr, managedString._ptr,
getPtr(font), getPtr(font),
optsFeaturesLen = opts.features?.size ?: 0, optsFeaturesLen = opts.features?.size ?: 0,
optsFeatures = arrayOfFontFeaturesToInterop(opts.features), optsFeatures = arrayOfFontFeaturesToInterop(opts.features),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment