Skip to content

fix(java): Wrong cast to int instead of float #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Danielku15 merged 2 commits into from
May 2, 2025
Merged

fix(java): Wrong cast to int instead of float #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c1dc5b
fix(java): Wrong cast to int instead of float
Danielku15 May 2, 2025
58c9ac0
chore: bump to 3.1
Danielku15 May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/Build.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static int LoadSkiaVersion()
return int.Parse(text[(startOfMarker + marker.Length)..endOfMarker].Trim());
}

static readonly Version FileVersionBase = new Version(3, 0, 0, 0);
static readonly Version FileVersionBase = new Version(3, 1, 0, 0);

#endregion

Expand Down
2 changes: 1 addition & 1 deletion lib/dotnet/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>
<Version Condition=" '$(Version)' == '' ">3.0.135</Version>
<Version Condition=" '$(Version)' == '' ">3.1.135</Version>
<AssemblyVersion Condition=" '$(AssemblyVersion)' == '' ">$(Version).0</AssemblyVersion>
<FileVersion Condition=" '$(FileVersion)' == '' ">$(AssemblyVersion)</FileVersion>
<NeutralLanguage>en</NeutralLanguage>
Expand Down
2 changes: 1 addition & 1 deletion lib/java/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var libAuthorId = ""
var libAuthorName = ""
var libOrgUrl = ""
var libCompany = ""
var libVersion = "3.0.135"
var libVersion = "3.1.135"
var libProjectUrl = ""
var libGitUrlHttp = ""
var libGitUrlGit = ""
Expand Down
46 changes: 23 additions & 23 deletions lib/java/jni/src/AlphaSkiaTextMetrics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ extern "C"
JNIEXPORT jfloat JNICALL Java_alphaTab_alphaSkia_AlphaSkiaTextMetrics_getWidth(JNIEnv *env, jobject instance)
{
jlong handle = get_handle(env, instance);
CHECK_HANDLE_RETURN(handle, static_cast<jint>(0))
CHECK_HANDLE_RETURN(handle, static_cast<jfloat>(0))

uint16_t value = alphaskia_text_metrics_get_width(reinterpret_cast<alphaskia_text_metrics_t>(handle));
return static_cast<jint>(value);
Expand All @@ -16,100 +16,100 @@ extern "C"
JNIEXPORT jfloat JNICALL Java_alphaTab_alphaSkia_AlphaSkiaTextMetrics_getActualBoundingBoxLeft(JNIEnv *env, jobject instance)
{
jlong handle = get_handle(env, instance);
CHECK_HANDLE_RETURN(handle, static_cast<jint>(0))
CHECK_HANDLE_RETURN(handle, static_cast<jfloat>(0))

uint16_t value = alphaskia_text_metrics_get_actual_bounding_box_left(reinterpret_cast<alphaskia_text_metrics_t>(handle));
return static_cast<jint>(value);
return static_cast<jfloat>(value);
}

JNIEXPORT jfloat JNICALL Java_alphaTab_alphaSkia_AlphaSkiaTextMetrics_getActualBoundingBoxRight(JNIEnv *env, jobject instance)
{
jlong handle = get_handle(env, instance);
CHECK_HANDLE_RETURN(handle, static_cast<jint>(0))
CHECK_HANDLE_RETURN(handle, static_cast<jfloat>(0))

uint16_t value = alphaskia_text_metrics_get_actual_bounding_box_right(reinterpret_cast<alphaskia_text_metrics_t>(handle));
return static_cast<jint>(value);
return static_cast<jfloat>(value);
}

JNIEXPORT jfloat JNICALL Java_alphaTab_alphaSkia_AlphaSkiaTextMetrics_getFontBoundingBoxAscent(JNIEnv *env, jobject instance)
{
jlong handle = get_handle(env, instance);
CHECK_HANDLE_RETURN(handle, static_cast<jint>(0))
CHECK_HANDLE_RETURN(handle, static_cast<jfloat>(0))

uint16_t value = alphaskia_text_metrics_get_font_bounding_box_ascent(reinterpret_cast<alphaskia_text_metrics_t>(handle));
return static_cast<jint>(value);
return static_cast<jfloat>(value);
}

JNIEXPORT jfloat JNICALL Java_alphaTab_alphaSkia_AlphaSkiaTextMetrics_getFontBoundingBoxDescent(JNIEnv *env, jobject instance)
{
jlong handle = get_handle(env, instance);
CHECK_HANDLE_RETURN(handle, static_cast<jint>(0))
CHECK_HANDLE_RETURN(handle, static_cast<jfloat>(0))

uint16_t value = alphaskia_text_metrics_get_font_bounding_box_descent(reinterpret_cast<alphaskia_text_metrics_t>(handle));
return static_cast<jint>(value);
return static_cast<jfloat>(value);
}

JNIEXPORT jfloat JNICALL Java_alphaTab_alphaSkia_AlphaSkiaTextMetrics_getActualBoundingBoxAscent(JNIEnv *env, jobject instance)
{
jlong handle = get_handle(env, instance);
CHECK_HANDLE_RETURN(handle, static_cast<jint>(0))
CHECK_HANDLE_RETURN(handle, static_cast<jfloat>(0))

uint16_t value = alphaskia_text_metrics_get_actual_bounding_box_ascent(reinterpret_cast<alphaskia_text_metrics_t>(handle));
return static_cast<jint>(value);
return static_cast<jfloat>(value);
}

JNIEXPORT jfloat JNICALL Java_alphaTab_alphaSkia_AlphaSkiaTextMetrics_getActualBoundingBoxDescent(JNIEnv *env, jobject instance)
{
jlong handle = get_handle(env, instance);
CHECK_HANDLE_RETURN(handle, static_cast<jint>(0))
CHECK_HANDLE_RETURN(handle, static_cast<jfloat>(0))

uint16_t value = alphaskia_text_metrics_get_actual_bounding_box_descent(reinterpret_cast<alphaskia_text_metrics_t>(handle));
return static_cast<jint>(value);
return static_cast<jfloat>(value);
}

JNIEXPORT jfloat JNICALL Java_alphaTab_alphaSkia_AlphaSkiaTextMetrics_getEmHeightAscent(JNIEnv *env, jobject instance)
{
jlong handle = get_handle(env, instance);
CHECK_HANDLE_RETURN(handle, static_cast<jint>(0))
CHECK_HANDLE_RETURN(handle, static_cast<jfloat>(0))

uint16_t value = alphaskia_text_metrics_get_em_height_ascent(reinterpret_cast<alphaskia_text_metrics_t>(handle));
return static_cast<jint>(value);
return static_cast<jfloat>(value);
}

JNIEXPORT jfloat JNICALL Java_alphaTab_alphaSkia_AlphaSkiaTextMetrics_getEmHeightDescent(JNIEnv *env, jobject instance)
{
jlong handle = get_handle(env, instance);
CHECK_HANDLE_RETURN(handle, static_cast<jint>(0))
CHECK_HANDLE_RETURN(handle, static_cast<jfloat>(0))

uint16_t value = alphaskia_text_metrics_get_em_height_descent(reinterpret_cast<alphaskia_text_metrics_t>(handle));
return static_cast<jint>(value);
return static_cast<jfloat>(value);
}

JNIEXPORT jfloat JNICALL Java_alphaTab_alphaSkia_AlphaSkiaTextMetrics_getHangingBaseline(JNIEnv *env, jobject instance)
{
jlong handle = get_handle(env, instance);
CHECK_HANDLE_RETURN(handle, static_cast<jint>(0))
CHECK_HANDLE_RETURN(handle, static_cast<jfloat>(0))

uint16_t value = alphaskia_text_metrics_get_hanging_baseline(reinterpret_cast<alphaskia_text_metrics_t>(handle));
return static_cast<jint>(value);
return static_cast<jfloat>(value);
}

JNIEXPORT jfloat JNICALL Java_alphaTab_alphaSkia_AlphaSkiaTextMetrics_getAlphabeticBaseline(JNIEnv *env, jobject instance)
{
jlong handle = get_handle(env, instance);
CHECK_HANDLE_RETURN(handle, static_cast<jint>(0))
CHECK_HANDLE_RETURN(handle, static_cast<jfloat>(0))

uint16_t value = alphaskia_text_metrics_get_alphabetic_baseline(reinterpret_cast<alphaskia_text_metrics_t>(handle));
return static_cast<jint>(value);
return static_cast<jfloat>(value);
}

JNIEXPORT jfloat JNICALL Java_alphaTab_alphaSkia_AlphaSkiaTextMetrics_getIdeographicBaseline(JNIEnv *env, jobject instance)
{
jlong handle = get_handle(env, instance);
CHECK_HANDLE_RETURN(handle, static_cast<jint>(0))
CHECK_HANDLE_RETURN(handle, static_cast<jfloat>(0))

uint16_t value = alphaskia_text_metrics_get_ideographic_baseline(reinterpret_cast<alphaskia_text_metrics_t>(handle));
return static_cast<jint>(value);
return static_cast<jfloat>(value);
}

JNIEXPORT void JNICALL Java_alphaTab_alphaSkia_AlphaSkiaTextMetrics_close(JNIEnv *env, jobject instance)
Expand Down
2 changes: 1 addition & 1 deletion lib/node/alphaskia-linux/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coderline/alphaskia-linux",
"version": "3.0.135",
"version": "3.1.135",
"description": "The node addon for alphaSkia enabling it to run on Linux",
"engines": {
"node": ">=18.0.0"
Expand Down
2 changes: 1 addition & 1 deletion lib/node/alphaskia-macos/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coderline/alphaskia-macos",
"version": "3.0.135",
"version": "3.1.135",
"description": "The node addon for alphaSkia enabling it to run on MacOS",
"engines": {
"node": ">=18.0.0"
Expand Down
2 changes: 1 addition & 1 deletion lib/node/alphaskia-windows/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coderline/alphaskia-windows",
"version": "3.0.135",
"version": "3.1.135",
"description": "The node addon for alphaSkia enabling it to run on Windows",
"engines": {
"node": ">=18.0.0"
Expand Down
2 changes: 1 addition & 1 deletion lib/node/alphaskia/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coderline/alphaskia",
"version": "3.0.135",
"version": "3.1.135",
"description": "A Skia based rendering backend for alphaTab.",
"module": "./dist/alphaskia.mjs",
"typings": "./dist/alphaskia.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion test/java/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

// do not inline (updated dynamically via Nuke)
var libVersion = "3.0.135"
var libVersion = "3.1.135"

group = "alphaTab.alphaSkia"
version = libVersion
Expand Down
2 changes: 1 addition & 1 deletion test/node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "alphaskiatest",
"version": "3.0.135",
"version": "3.1.135",
"private": true,
"scripts": {
"start": "tsx index.ts"
Expand Down
Loading