From 990dde6878ba2aff91fb30221cb852682d76d0d6 Mon Sep 17 00:00:00 2001 From: Zhiming Wang Date: Sun, 26 Jul 2020 01:01:32 +0800 Subject: [PATCH] Fix clippy::transmute_ptr_to_ptr --- src/util/format/sample.rs | 7 +++---- src/util/frame/audio.rs | 9 ++------- src/util/frame/video.rs | 4 ++-- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/util/format/sample.rs b/src/util/format/sample.rs index 48b5334..87ff452 100644 --- a/src/util/format/sample.rs +++ b/src/util/format/sample.rs @@ -1,12 +1,11 @@ use std::{ ffi::{CStr, CString}, - mem, ops::Index, ptr, slice, str::from_utf8_unchecked, }; -use libc::c_int; +use libc::{c_int, c_void}; use crate::ffi::{AVSampleFormat::*, *}; @@ -208,7 +207,7 @@ impl Clone for Buffer { unsafe { av_samples_copy( self.buffer, - mem::transmute(source.buffer), + source.buffer as *const *mut u8, 0, 0, source.samples as c_int, @@ -223,7 +222,7 @@ impl Drop for Buffer { #[inline] fn drop(&mut self) { unsafe { - av_freep(mem::transmute(self.buffer)); + av_freep(self.buffer as *mut c_void); } } } diff --git a/src/util/frame/audio.rs b/src/util/frame/audio.rs index bf2acf8..ebec623 100644 --- a/src/util/frame/audio.rs +++ b/src/util/frame/audio.rs @@ -149,7 +149,7 @@ impl Audio { panic!("unsupported type"); } - unsafe { slice::from_raw_parts(mem::transmute((*self.as_ptr()).data[index]), self.samples()) } + unsafe { slice::from_raw_parts((*self.as_ptr()).data[index] as *const T, self.samples()) } } #[inline] @@ -162,12 +162,7 @@ impl Audio { panic!("unsupported type"); } - unsafe { - slice::from_raw_parts_mut( - mem::transmute((*self.as_mut_ptr()).data[index]), - self.samples(), - ) - } + unsafe { slice::from_raw_parts_mut((*self.as_mut_ptr()).data[index] as *mut T, self.samples()) } } #[inline] diff --git a/src/util/frame/video.rs b/src/util/frame/video.rs index e1497fe..f568585 100644 --- a/src/util/frame/video.rs +++ b/src/util/frame/video.rs @@ -267,7 +267,7 @@ impl Video { unsafe { slice::from_raw_parts( - mem::transmute((*self.as_ptr()).data[index]), + (*self.as_ptr()).data[index] as *const T, self.stride(index) * self.plane_height(index) as usize / mem::size_of::(), ) } @@ -285,7 +285,7 @@ impl Video { unsafe { slice::from_raw_parts_mut( - mem::transmute((*self.as_mut_ptr()).data[index]), + (*self.as_mut_ptr()).data[index] as *mut T, self.stride(index) * self.plane_height(index) as usize / mem::size_of::(), ) }