From e947bc56064a4aec2fcaa8bfbbce718e0b7359cb 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 fda106c..42ab7c5 100644 --- a/src/util/format/sample.rs +++ b/src/util/format/sample.rs @@ -1,5 +1,4 @@ use std::ffi::{CStr, CString}; -use std::mem; use std::ops::Index; use std::ptr; use std::slice; @@ -7,7 +6,7 @@ use std::str::from_utf8_unchecked; use ffi::AVSampleFormat::*; use ffi::*; -use libc::c_int; +use libc::{c_int, c_void}; #[derive(Eq, PartialEq, Copy, Clone, Debug)] pub enum Sample { @@ -203,7 +202,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, @@ -218,7 +217,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 f29c427..12a0694 100644 --- a/src/util/frame/audio.rs +++ b/src/util/frame/audio.rs @@ -148,9 +148,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] @@ -164,10 +162,7 @@ impl Audio { } unsafe { - slice::from_raw_parts_mut( - mem::transmute((*self.as_mut_ptr()).data[index]), - self.samples(), - ) + slice::from_raw_parts_mut((*self.as_mut_ptr()).data[index] as *mut T, self.samples()) } } diff --git a/src/util/frame/video.rs b/src/util/frame/video.rs index e4fcdb5..71e0d76 100644 --- a/src/util/frame/video.rs +++ b/src/util/frame/video.rs @@ -260,7 +260,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::(), ) } @@ -278,7 +278,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::(), ) }