Skip to content

Commit 4f251a9

Browse files
committed
chore(canvas-core): clean up
1 parent a19c71a commit 4f251a9

File tree

5 files changed

+17
-20
lines changed

5 files changed

+17
-20
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dependencies {
2+
implementation 'com.github.triniwiz:canvas:0.9.2'
3+
}

packages/canvas/platforms/android/include.gradle

Lines changed: 0 additions & 3 deletions
This file was deleted.

packages/canvas/src-native/canvas-native/canvas-core/src/android/core.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1832,7 +1832,7 @@ pub unsafe extern "C" fn Java_com_github_triniwiz_canvas_CanvasRenderingContext2
18321832
dirty_width: jint,
18331833
dirty_height: jint,
18341834
) -> jlong {
1835-
let mut slice = env.get_direct_buffer_address(array);
1835+
let slice = env.get_direct_buffer_address(array);
18361836
match slice {
18371837
Ok(slice) => put_image_data(
18381838
canvas_native_ptr,

packages/canvas/src-native/canvas-native/canvas-core/src/android/webgl2_rendering_context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::os::raw::c_void;
88
use jni::{objects::JClass, JNIEnv};
99
use jni_sys::{jboolean, jint, jlong, JNI_TRUE};
1010

11-
use crate::common::{image_asset_get_bytes, image_asset_get_rgb_bytes, image_asset_get_rgba_bytes};
11+
use crate::common::{image_asset_get_rgb_bytes, image_asset_get_rgba_bytes};
1212

1313
const RGBA: u32 = 0x1908;
1414
const RGBA_INTEGER: u32 = 0x8D99;

packages/canvas/src-native/canvas-native/canvas-core/src/android/webgl_rendering_context.rs

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ use crate::android::bitmap::{
2121
ANDROID_BITMAP_RESULT_SUCCESS,
2222
};
2323
use crate::common::{
24-
image_asset_flip_y, image_asset_flip_y_in_place, image_asset_get_rgb_bytes,
25-
image_asset_get_rgba_bytes,
24+
image_asset_flip_y_in_place, image_asset_get_rgb_bytes, image_asset_get_rgba_bytes,
2625
};
2726

2827
const RGBA: u32 = 0x1908;
@@ -329,19 +328,17 @@ pub unsafe extern "C" fn Java_com_github_triniwiz_canvas_WebGLRenderingContext_n
329328
height as usize,
330329
);
331330
}
332-
unsafe {
333-
gl_bindings::glTexSubImage2D(
334-
target as u32,
335-
level,
336-
xoffset,
337-
yoffset,
338-
width,
339-
height,
340-
format as u32,
341-
image_type as u32,
342-
data.array as *const c_void,
343-
);
344-
}
331+
gl_bindings::glTexSubImage2D(
332+
target as u32,
333+
level,
334+
xoffset,
335+
yoffset,
336+
width,
337+
height,
338+
format as u32,
339+
image_type as u32,
340+
data.array as *const c_void,
341+
);
345342
}
346343

347344
#[no_mangle]

0 commit comments

Comments
 (0)