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
e463c57d
Unverified
Commit
e463c57d
authored
Feb 14, 2024
by
Oleksandr Karpovich
Committed by
GitHub
Feb 14, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add `fun Image.Companion.makeFromEncoded(nsData: NSData): Image` (#873)
parent
1d380da1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
69 additions
and
1 deletion
+69
-1
Image.kt
skiko/src/commonMain/kotlin/org/jetbrains/skia/Image.kt
+1
-1
Image.darwin.kt
.../src/darwinMain/kotlin/org/jetbrains/skia/Image.darwin.kt
+14
-0
ImageTest.darwin.kt
.../darwinTest/kotlin/org/jetbrains/skia/ImageTest.darwin.kt
+54
-0
No files found.
skiko/src/commonMain/kotlin/org/jetbrains/skia/Image.kt
View file @
e463c57d
...
@@ -428,7 +428,7 @@ private external fun _nMakeFromPixmap(pixmapPtr: NativePointer): NativePointer
...
@@ -428,7 +428,7 @@ private external fun _nMakeFromPixmap(pixmapPtr: NativePointer): NativePointer
@ExternalSymbolName
(
"org_jetbrains_skia_Image__1nMakeFromEncoded"
)
@ExternalSymbolName
(
"org_jetbrains_skia_Image__1nMakeFromEncoded"
)
@ModuleImport
(
"./skiko.mjs"
,
"org_jetbrains_skia_Image__1nMakeFromEncoded"
)
@ModuleImport
(
"./skiko.mjs"
,
"org_jetbrains_skia_Image__1nMakeFromEncoded"
)
private
external
fun
_nMakeFromEncoded
(
bytes
:
InteropPointer
,
encodedLength
:
Int
):
NativePointer
internal
external
fun
_nMakeFromEncoded
(
bytes
:
InteropPointer
,
encodedLength
:
Int
):
NativePointer
@ExternalSymbolName
(
"org_jetbrains_skia_Image__1nEncodeToData"
)
@ExternalSymbolName
(
"org_jetbrains_skia_Image__1nEncodeToData"
)
@ModuleImport
(
"./skiko.mjs"
,
"org_jetbrains_skia_Image__1nEncodeToData"
)
@ModuleImport
(
"./skiko.mjs"
,
"org_jetbrains_skia_Image__1nEncodeToData"
)
...
...
skiko/src/darwinMain/kotlin/org/jetbrains/skia/Image.darwin.kt
0 → 100644
View file @
e463c57d
package
org.jetbrains.skia
import
platform.Foundation.NSData
import
kotlin.native.internal.NativePtr
fun
Image
.
Companion
.
makeFromEncoded
(
nsData
:
NSData
):
Image
{
val
ptr
=
nsData
.
bytes
?.
rawValue
?:
NativePtr
.
NULL
require
(
ptr
!=
NativePtr
.
NULL
)
{
"Failed to Image::makeFromEncoded"
}
// skia makes an internal copy of the nsData bytes
val
imgPtr
=
_nMakeFromEncoded
(
ptr
,
nsData
.
length
.
toInt
())
require
(
imgPtr
!=
NativePtr
.
NULL
)
{
"Failed to Image::makeFromEncoded"
}
return
Image
(
imgPtr
)
}
\ No newline at end of file
skiko/src/darwinTest/kotlin/org/jetbrains/skia/ImageTest.darwin.kt
0 → 100644
View file @
e463c57d
package
org.jetbrains.skia
import
kotlinx.cinterop.ExperimentalForeignApi
import
kotlinx.cinterop.addressOf
import
kotlinx.cinterop.pin
import
platform.Foundation.NSData
import
platform.Foundation.dataWithBytes
import
kotlin.test.Test
import
kotlin.test.assertEquals
class
ImageTestDarwin
{
@Test
fun
canCreateFromEncodedNsData
()
{
val
bytes
=
intArrayOf
(
0
xCA
,
0
xDA
,
0
xCA
,
0
xC9
,
0
xA3
,
0
xAC
,
0
xA8
,
0
x89
,
0
xA7
,
0
x87
,
0
x9B
,
0
xB5
,
0
xE5
,
0
x95
,
0
x46
,
0
x90
,
0
x81
,
0
xC5
,
0
x71
,
0
x33
,
0
x75
,
0
x55
,
0
x44
,
0
x40
,
0
x30
).
map
{
it
.
toByte
()
}.
toByteArray
()
val
imageInfo
=
ImageInfo
(
width
=
5
,
height
=
5
,
colorType
=
ColorType
.
GRAY_8
,
alphaType
=
ColorAlphaType
.
OPAQUE
)
val
image
=
Image
.
makeRaster
(
imageInfo
,
bytes
,
5
)
val
data
=
image
.
encodeToData
()
!!
val
originalBitmap
=
Bitmap
.
makeFromImage
(
image
)
val
nsData
=
createNSDataFromByteArray
(
data
.
bytes
)
val
imageFromNsData
=
Image
.
makeFromEncoded
(
nsData
)
val
bitmapFromNsData
=
Bitmap
.
makeFromImage
(
imageFromNsData
)
assertEquals
(
imageInfo
.
height
,
imageFromNsData
.
imageInfo
.
height
)
assertEquals
(
imageInfo
.
width
,
imageFromNsData
.
imageInfo
.
width
)
assertEquals
(
imageInfo
.
colorAlphaType
,
imageFromNsData
.
imageInfo
.
colorAlphaType
)
assertEquals
(
imageInfo
.
colorType
,
imageFromNsData
.
imageInfo
.
colorType
)
repeat
(
5
)
{
x
->
repeat
(
5
)
{
y
->
assertEquals
(
originalBitmap
.
getColor
(
x
,
y
),
bitmapFromNsData
.
getColor
(
x
,
y
))
}
}
}
}
@OptIn
(
ExperimentalForeignApi
::
class
)
fun
createNSDataFromByteArray
(
bytes
:
ByteArray
):
NSData
{
return
NSData
.
dataWithBytes
(
bytes
.
pin
().
addressOf
(
0
),
bytes
.
size
.
toULong
())
}
\ No newline at end of file
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