wim/libczirw-sys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some more test and fixes to get them working

Browse Source
This commit is contained in:
Wim Pomp
2025-08-14 19:29:43 +02:00
parent e902eebd2b
commit d4899e275b
7 changed files with 178 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/functions.rs
View File

@@ -196,7 +196,10 @@ impl CziReader {
libCZI_ReaderGetPyramidStatistics(**self, ptr.as_mut_ptr())
})?;
let ptr = unsafe { ptr.assume_init() };
let statistics = unsafe { CStr::from_ptr(ptr) }.to_str()?.to_owned();
assert!(!ptr.is_null());
let statistics = unsafe { CStr::from_ptr(ptr) }
.to_string_lossy()
.into_owned();
unsafe { libCZI_Free(ptr as *mut c_void) };
Ok(statistics)
}
@@ -653,7 +656,7 @@ impl LockedBitmap {
***self,
width,
height,
pixel_type.into(),
pixel_type as i32,
stride,
data.as_mut_ptr() as *mut c_void,
)
@@ -733,7 +736,10 @@ impl CziDocumentInfo {
)
})?;
let ptr = unsafe { ptr.assume_init() };
let info = unsafe { CStr::from_ptr(ptr) }.to_str()?.to_owned();
assert!(!ptr.is_null());
let info = unsafe { CStr::from_ptr(ptr) }
.to_string_lossy()
.into_owned();
unsafe { libCZI_Free(ptr as *mut c_void) };
Ok(info)
}
@@ -782,9 +788,10 @@ impl CziDocumentInfo {
)
})?;
let ptr = unsafe { ptr.assume_init() };
let info = unsafe { CStr::from_ptr(ptr) }.to_str()?.to_owned();
unsafe { libCZI_Free(ptr as *mut c_void) };
Ok(info)
assert!(!ptr.is_null());
Ok(unsafe { CStr::from_ptr(ptr) }
.to_string_lossy()
.into_owned())
}
/// Release the specified CZI-document-info object.