Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
skiko
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liuqiang
skiko
Commits
d2e6e92e
Unverified
Commit
d2e6e92e
authored
Dec 21, 2021
by
Nikolay Igotti
Committed by
GitHub
Dec 21, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix few signature inconsistencies (#437)
Helps with
https://github.com/JetBrains/skiko/issues/431
parent
644574a6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
5 deletions
+4
-5
Canvas.kt
skiko/src/commonMain/kotlin/org/jetbrains/skia/Canvas.kt
+1
-1
Font.kt
skiko/src/commonMain/kotlin/org/jetbrains/skia/Font.kt
+1
-1
ManagedString.kt
...src/commonMain/kotlin/org/jetbrains/skia/ManagedString.kt
+1
-1
Paragraph.kt
...mmonMain/kotlin/org/jetbrains/skia/paragraph/Paragraph.kt
+0
-1
Paragraph.cc
skiko/src/nativeJsMain/cpp/paragraph/Paragraph.cc
+1
-1
No files found.
skiko/src/commonMain/kotlin/org/jetbrains/skia/Canvas.kt
View file @
d2e6e92e
...
...
@@ -1630,7 +1630,7 @@ private external fun _nDrawPaint(ptr: NativePointer, paintPtr: NativePointer)
private
external
fun
_nSetMatrix
(
ptr
:
NativePointer
,
matrix
:
InteropPointer
)
@ExternalSymbolName
(
"org_jetbrains_skia_Canvas__1nGetLocalToDevice"
)
private
external
fun
_nGetLocalToDevice
(
ptr
:
NativePointer
,
resultFloats
:
InteropPointer
)
:
FloatArray
private
external
fun
_nGetLocalToDevice
(
ptr
:
NativePointer
,
resultFloats
:
InteropPointer
)
@ExternalSymbolName
(
"org_jetbrains_skia_Canvas__1nResetMatrix"
)
private
external
fun
_nResetMatrix
(
ptr
:
NativePointer
)
...
...
skiko/src/commonMain/kotlin/org/jetbrains/skia/Font.kt
View file @
d2e6e92e
...
...
@@ -689,7 +689,7 @@ private external fun _nGetUTF32Glyphs(ptr: NativePointer, uni: InteropPointer, u
private
external
fun
_nGetStringGlyphsCount
(
ptr
:
NativePointer
,
str
:
InteropPointer
,
len
:
Int
):
Int
@ExternalSymbolName
(
"org_jetbrains_skia_Font__1nMeasureText"
)
private
external
fun
_nMeasureText
(
ptr
:
NativePointer
,
str
:
InteropPointer
,
len
:
Int
,
paintPtr
:
NativePointer
,
rect
:
InteropPointer
)
:
Rect
private
external
fun
_nMeasureText
(
ptr
:
NativePointer
,
str
:
InteropPointer
,
len
:
Int
,
paintPtr
:
NativePointer
,
rect
:
InteropPointer
)
@ExternalSymbolName
(
"org_jetbrains_skia_Font__1nMeasureTextWidth"
)
private
external
fun
_nMeasureTextWidth
(
ptr
:
NativePointer
,
str
:
InteropPointer
,
len
:
Int
,
paintPtr
:
NativePointer
):
Float
...
...
skiko/src/commonMain/kotlin/org/jetbrains/skia/ManagedString.kt
View file @
d2e6e92e
...
...
@@ -71,7 +71,7 @@ private external fun _nMake(s: InteropPointer): NativePointer
private
external
fun
_nStringSize
(
ptr
:
NativePointer
):
Int
@ExternalSymbolName
(
"org_jetbrains_skia_ManagedString__nStringData"
)
private
external
fun
_nStringData
(
ptr
:
NativePointer
,
result
:
InteropPointer
,
size
:
Int
)
:
String
private
external
fun
_nStringData
(
ptr
:
NativePointer
,
result
:
InteropPointer
,
size
:
Int
)
@ExternalSymbolName
(
"org_jetbrains_skia_ManagedString__1nInsert"
)
private
external
fun
_nInsert
(
ptr
:
NativePointer
,
offset
:
Int
,
s
:
InteropPointer
)
...
...
skiko/src/commonMain/kotlin/org/jetbrains/skia/paragraph/Paragraph.kt
View file @
d2e6e92e
...
...
@@ -333,7 +333,6 @@ private external fun _nGetUnresolvedGlyphsCount(ptr: NativePointer): Int
@ExternalSymbolName
(
"org_jetbrains_skia_paragraph_Paragraph__1nUpdateAlignment"
)
private
external
fun
_nUpdateAlignment
(
ptr
:
NativePointer
,
Align
:
Int
)
@ExternalSymbolName
(
"org_jetbrains_skia_paragraph_Paragraph__1nUpdateFontSize"
)
private
external
fun
_nUpdateFontSize
(
ptr
:
NativePointer
,
from
:
Int
,
to
:
Int
,
size
:
Float
,
textPtr
:
NativePointer
)
...
...
skiko/src/nativeJsMain/cpp/paragraph/Paragraph.cc
View file @
d2e6e92e
...
...
@@ -121,7 +121,7 @@ SKIKO_EXPORT void org_jetbrains_skia_paragraph_Paragraph__1nGetWordBoundary
}
SKIKO_EXPORT
K
InteropPointerArray
org_jetbrains_skia_paragraph_Paragraph__1nGetLineMetrics
SKIKO_EXPORT
K
NativePointer
org_jetbrains_skia_paragraph_Paragraph__1nGetLineMetrics
(
KNativePointer
ptr
,
KNativePointer
textPtr
)
{
Paragraph
*
instance
=
reinterpret_cast
<
Paragraph
*>
((
ptr
));
SkString
*
text
=
reinterpret_cast
<
SkString
*>
((
textPtr
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment