mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2024-05-19 00:38:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'from-glib-ptr-borrow-reference' into 'main'

Browse source 
gstreamer: Use a reference to a pointer of correct mutability for from_glib_ptr_borrow()

See merge request gstreamer/gstreamer-rs!1436
This commit is contained in:
Sebastian Dröge 2024-04-30 12:41:05 +00:00
parent 238768f525 fe1fe5b114
commit 4d8f83e8cf
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gstreamer/src/miniobject.rs
View file

@ -30,10 +30,12 @@ macro_rules! mini_object_wrapper (
impl $name {
#[inline]
pub unsafe fn from_glib_ptr_borrow<'a>(
ptr: *const *const $ffi_name,
) -> &'a Self {
&*(ptr as *const $name)
pub unsafe fn from_glib_ptr_borrow(
ptr: &*mut $ffi_name,
) -> &Self {
debug_assert_eq!(std::mem::size_of::<$name>(), std::mem::size_of::<$crate::glib::ffi::gpointer>());
debug_assert!(!ptr.is_null());
&*(ptr as *const *mut $ffi_name as *const $name)
}
#[inline]
@ -548,11 +550,8 @@ macro_rules! mini_object_wrapper (
#[inline]
unsafe fn from_value(value: &'a $crate::glib::Value) -> Self {
skip_assert_initialized!();
assert_eq!(std::mem::size_of::<$name>(), std::mem::size_of::<$crate::glib::ffi::gpointer>());
let value = &*(value as *const $crate::glib::Value as *const $crate::glib::gobject_ffi::GValue);
let ptr = &value.data[0].v_pointer as *const $crate::glib::ffi::gpointer as *const *const $ffi_name;
debug_assert!(!(*ptr).is_null());
&*(ptr as *const $name)
$name::from_glib_ptr_borrow(&*(&value.data[0].v_pointer as *const $crate::glib::ffi::gpointer as *const *mut $ffi_name))
}
}