Skip to content

Update null defaults in woff2 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nunoplopes merged 1 commit into from
May 11, 2026
Merged

Update null defaults in woff2 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions woff2/out/unsafe/src/bin/woff2_compress.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ impl woff2_Buffer {
}
pub unsafe fn Skip(&mut self, mut n_bytes: u64) -> bool {
return (unsafe {
let _data: *mut u8 = Default::default();
let _data: *mut u8 = std::ptr::null_mut();
let _n_bytes: u64 = n_bytes;
self.Read(_data, _n_bytes)
});
Expand Down Expand Up @@ -696,7 +696,7 @@ impl woff2_Font {
return if it
== UnsafeMapIterator::end(&self.tables as *const BTreeMap<u32, Box<woff2_Font_Table>>)
{
Default::default()
std::ptr::null_mut()
} else {
(&mut *it.second() as *mut woff2_Font_Table)
};
Expand All @@ -711,7 +711,7 @@ impl woff2_Font {
return if it
== UnsafeMapIterator::end(&self.tables as *const BTreeMap<u32, Box<woff2_Font_Table>>)
{
Default::default()
std::ptr::null()
} else {
(&*it.second() as *const woff2_Font_Table)
};
Expand Down Expand Up @@ -796,7 +796,7 @@ pub unsafe fn ReadTrueTypeFont_15(
'loop_: while ((i as i32) < ((*font).num_tables as i32)) {
let mut table: woff2_Font_Table = <woff2_Font_Table>::default();
table.flag_byte = 0_u8;
table.reuse_of = Default::default();
table.reuse_of = std::ptr::null_mut();
if (((!(unsafe {
let _value: *mut u32 = (&mut table.tag as *mut u32);
(*file).ReadU32(_value)
Expand Down Expand Up @@ -846,7 +846,7 @@ pub unsafe fn ReadTrueTypeFont_15(
(*font).FindTable_u32(_tag)
})
.cast_const();
if ((head_table) != (Default::default())) && (((*head_table).length) < (52_u32)) {
if ((head_table) != (std::ptr::null())) && (((*head_table).length) < (52_u32)) {
return false;
}
return true;
Expand Down Expand Up @@ -1324,7 +1324,7 @@ pub unsafe fn NumGlyphs_27(font: *const woff2_Font) -> i32 {
let _tag: u32 = woff2_kLocaTableTag;
(*font).FindTable_u32_const(_tag)
});
if (((head_table) == (Default::default())) || ((loca_table) == (Default::default())))
if (((head_table) == (std::ptr::null())) || ((loca_table) == (std::ptr::null())))
|| (((*head_table).length) < (52_u32))
{
return 0;
Expand All @@ -1345,14 +1345,14 @@ pub unsafe fn IndexFormat_28(font: *const woff2_Font) -> i32 {
let _tag: u32 = woff2_kHeadTableTag;
(*font).FindTable_u32_const(_tag)
});
if ((head_table) == (Default::default())) {
if ((head_table) == (std::ptr::null())) {
return 0;
}
return ((*(*head_table).data.offset((51) as isize)) as i32);
}
impl woff2_Font_Table {
pub unsafe fn IsReused(&self) -> bool {
return ((self.reuse_of) != (Default::default()));
return ((self.reuse_of) != (std::ptr::null_mut()));
}
}
pub unsafe fn GetGlyphData_29(
Expand All @@ -1376,8 +1376,8 @@ pub unsafe fn GetGlyphData_29(
let _tag: u32 = woff2_kGlyfTableTag;
(*font).FindTable_u32_const(_tag)
});
if ((((head_table) == (Default::default())) || ((loca_table) == (Default::default())))
|| ((glyf_table) == (Default::default())))
if ((((head_table) == (std::ptr::null())) || ((loca_table) == (std::ptr::null())))
|| ((glyf_table) == (std::ptr::null())))
|| (((*head_table).length) < (52_u32))
{
return false;
Expand Down Expand Up @@ -1475,10 +1475,10 @@ impl woff2_Glyph {
y_min: 0_i16,
y_max: 0_i16,
instructions_size: 0_u16,
instructions_data: Default::default(),
instructions_data: std::ptr::null(),
overlap_simple_flag_set: false,
contours: Vec::new(),
composite_data: Default::default(),
composite_data: std::ptr::null(),
composite_data_size: 0_u32,
have_instructions: false,
};
Expand Down Expand Up @@ -2122,7 +2122,7 @@ pub unsafe fn WriteNormalizedLoca_42(
let mut glyf_dst: *mut u8 = if (num_glyphs != 0) {
(&mut (&mut (*glyf_table)).buffer[(0_u64) as usize] as *mut u8)
} else {
Default::default()
std::ptr::null_mut()
};
let mut loca_dst: *mut u8 = (&mut (&mut (*loca_table)).buffer[(0_u64) as usize] as *mut u8);
let mut glyf_offset: u32 = 0_u32;
Expand All @@ -2137,7 +2137,7 @@ pub unsafe fn WriteNormalizedLoca_42(
StoreLoca_41(_index_fmt, _value, _offset, _dst)
});
let mut glyph: woff2_Glyph = woff2_Glyph::woff2_Glyph();
let mut glyph_data: *const u8 = Default::default();
let mut glyph_data: *const u8 = std::ptr::null();
let mut glyph_size: u64 = 0_u64;
if (!(unsafe {
let _font: *const woff2_Font = &(*font) as *const woff2_Font;
Expand Down Expand Up @@ -2193,14 +2193,14 @@ pub unsafe fn WriteNormalizedLoca_42(
(*glyf_table).data = if (glyf_offset != 0) {
(&mut (&mut (*glyf_table)).buffer[(0_u64) as usize] as *mut u8)
} else {
Default::default()
std::ptr::null_mut()
}
.cast_const();
(*glyf_table).length = glyf_offset;
(*loca_table).data = if (loca_offset != 0) {
(&mut (&mut (*loca_table)).buffer[(0_u64) as usize] as *mut u8)
} else {
Default::default()
std::ptr::null_mut()
}
.cast_const();
return true;
Expand All @@ -2210,7 +2210,7 @@ pub unsafe fn MakeEditableBuffer_43(mut font: *mut woff2_Font, mut tableTag: i32
let _tag: u32 = (tableTag as u32);
(*font).FindTable_u32(_tag)
});
if ((table) == (Default::default())) {
if ((table) == (std::ptr::null_mut())) {
return false;
}
if (unsafe { (*table.cast_const()).IsReused() }) {
Expand Down Expand Up @@ -2261,14 +2261,14 @@ pub unsafe fn NormalizeGlyphs_44(mut font: *mut woff2_Font) -> bool {
let _tag: u32 = woff2_kLocaTableTag;
(*font).FindTable_u32(_tag)
});
if ((head_table) == (Default::default())) {
if ((head_table) == (std::ptr::null_mut())) {
return false;
}
if ((loca_table) == (Default::default())) && ((glyf_table) == (Default::default())) {
if ((loca_table) == (std::ptr::null_mut())) && ((glyf_table) == (std::ptr::null_mut())) {
return true;
}
if ((((glyf_table) == (Default::default())) as i32)
!= (((loca_table) == (Default::default())) as i32))
if ((((glyf_table) == (std::ptr::null_mut())) as i32)
!= (((loca_table) == (std::ptr::null_mut())) as i32))
{
return false;
}
Expand Down Expand Up @@ -2369,10 +2369,10 @@ pub unsafe fn FixChecksums_47(mut font: *mut woff2_Font) -> bool {
let _tag: u32 = woff2_kHeadTableTag;
(*font).FindTable_u32(_tag)
});
if ((head_table) == (Default::default())) {
if ((head_table) == (std::ptr::null_mut())) {
return false;
}
if (((*head_table).reuse_of) != (Default::default())) {
if (((*head_table).reuse_of) != (std::ptr::null_mut())) {
head_table = (*head_table).reuse_of;
}
if (((*head_table).length) < (12_u32)) {
Expand Down Expand Up @@ -2425,10 +2425,10 @@ pub unsafe fn MarkTransformed_48(mut font: *mut woff2_Font) -> bool {
let _tag: u32 = woff2_kHeadTableTag;
(*font).FindTable_u32(_tag)
});
if ((head_table) == (Default::default())) {
if ((head_table) == (std::ptr::null_mut())) {
return false;
}
if (((*head_table).reuse_of) != (Default::default())) {
if (((*head_table).reuse_of) != (std::ptr::null_mut())) {
head_table = (*head_table).reuse_of;
}
if (((*head_table).length) < (17_u32)) {
Expand Down Expand Up @@ -2971,11 +2971,11 @@ pub unsafe fn TransformGlyfAndLocaTables_56(mut font: *mut woff2_Font) -> bool {
(*font).FindTable_u32(_tag)
})
.cast_const();
if ((loca_table) == (Default::default())) && ((glyf_table) == (Default::default())) {
if ((loca_table) == (std::ptr::null())) && ((glyf_table) == (std::ptr::null())) {
return true;
}
if ((((glyf_table) == (Default::default())) as i32)
!= (((loca_table) == (Default::default())) as i32))
if ((((glyf_table) == (std::ptr::null())) as i32)
!= (((loca_table) == (std::ptr::null())) as i32))
{
return false;
}
Expand Down Expand Up @@ -3005,7 +3005,7 @@ pub unsafe fn TransformGlyfAndLocaTables_56(mut font: *mut woff2_Font) -> bool {
let mut i: i32 = 0;
'loop_: while ((i) < (num_glyphs)) {
let mut glyph: woff2_Glyph = woff2_Glyph::woff2_Glyph();
let mut glyph_data: *const u8 = Default::default();
let mut glyph_data: *const u8 = std::ptr::null();
let mut glyph_size: u64 = 0_u64;
if (!(unsafe {
let _font: *const woff2_Font = &(*font) as *const woff2_Font;
Expand Down Expand Up @@ -3039,7 +3039,7 @@ pub unsafe fn TransformGlyfAndLocaTables_56(mut font: *mut woff2_Font) -> bool {
(*font).FindTable_u32(_tag)
})
.cast_const();
if ((head_table) == (Default::default())) || (((*head_table).length) < (52_u32)) {
if ((head_table) == (std::ptr::null())) || (((*head_table).length) < (52_u32)) {
return false;
}
(&mut (*transformed_glyf)).buffer[(7_u64) as usize] =
Expand All @@ -3049,7 +3049,7 @@ pub unsafe fn TransformGlyfAndLocaTables_56(mut font: *mut woff2_Font) -> bool {
(*transformed_glyf).data = (*transformed_glyf).buffer.as_mut_ptr().cast_const();
(*transformed_loca).tag = ((woff2_kLocaTableTag) ^ (2155905152_u32));
(*transformed_loca).length = 0_u32;
(*transformed_loca).data = Default::default();
(*transformed_loca).data = std::ptr::null();
return true;
}
pub unsafe fn TransformHmtxTable_57(mut font: *mut woff2_Font) -> bool {
Expand All @@ -3068,10 +3068,10 @@ pub unsafe fn TransformHmtxTable_57(mut font: *mut woff2_Font) -> bool {
(*font).FindTable_u32(_tag)
})
.cast_const();
if ((hmtx_table) == (Default::default())) || ((glyf_table) == (Default::default())) {
if ((hmtx_table) == (std::ptr::null())) || ((glyf_table) == (std::ptr::null())) {
return true;
}
if ((hhea_table) == (Default::default())) {
if ((hhea_table) == (std::ptr::null())) {
return false;
}
let mut hhea_buf: woff2_Buffer =
Expand Down Expand Up @@ -3103,7 +3103,7 @@ pub unsafe fn TransformHmtxTable_57(mut font: *mut woff2_Font) -> bool {
let mut i: i32 = 0;
'loop_: while ((i) < (num_glyphs)) {
let mut glyph: woff2_Glyph = woff2_Glyph::woff2_Glyph();
let mut glyph_data: *const u8 = Default::default();
let mut glyph_data: *const u8 = std::ptr::null();
let mut glyph_size: u64 = 0_u64;
if (!(unsafe {
let _font: *const woff2_Font = &(*font) as *const woff2_Font;
Expand Down Expand Up @@ -3663,7 +3663,7 @@ pub unsafe fn ConvertTTFToWOFF2_73(
let _tag: u32 = ((tag) ^ (2155905152_u32));
(*font).FindTable_u32_const(_tag)
});
if ((table_to_store) == (Default::default())) {
if ((table_to_store) == (std::ptr::null())) {
table_to_store = (original);
}
(unsafe {
Expand Down Expand Up @@ -3748,7 +3748,7 @@ pub unsafe fn ConvertTTFToWOFF2_73(
let _tag: u32 = (((*src_table).tag) ^ (2155905152_u32));
(*font).FindTable_u32_const(_tag)
});
if ((transformed_table) != (Default::default())) {
if ((transformed_table) != (std::ptr::null())) {
table.flags = ((*transformed_table).flag_byte as u32);
table.flags = ((table.flags as u32) | woff2_kWoff2FlagsTransform) as u32;
table.transform_length = (*transformed_table).length;
Expand Down
8 changes: 4 additions & 4 deletions woff2/out/unsafe/src/bin/woff2_decompress.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ impl woff2_Buffer {
}
pub unsafe fn Skip(&mut self, mut n_bytes: u64) -> bool {
return (unsafe {
let _data: *mut u8 = Default::default();
let _data: *mut u8 = std::ptr::null_mut();
let _n_bytes: u64 = n_bytes;
self.Read(_data, _n_bytes)
});
Expand Down Expand Up @@ -1319,7 +1319,7 @@ pub unsafe fn ReconstructGlyf_25(
substreams[(6_u64) as usize].0,
substreams[(6_u64) as usize].1,
);
let mut overlap_bitmap: *const u8 = Default::default();
let mut overlap_bitmap: *const u8 = std::ptr::null();
let mut overlap_bitmap_length: u32 = 0_u32;
if has_overlap_bitmap {
overlap_bitmap_length = (((((*info).num_glyphs as i32) + (7)) >> (3)) as u32);
Expand Down Expand Up @@ -1774,7 +1774,7 @@ pub unsafe fn FindTable_26(
return table;
}
}
return Default::default();
return std::ptr::null_mut();
}
pub unsafe fn ReadNumHMetrics_27(
mut data: *const u8,
Expand Down Expand Up @@ -2180,7 +2180,7 @@ pub unsafe fn ReconstructFont_35(
printf(b"Cannot have just one of glyf/loca\n\0".as_ptr() as *const i8);
return false;
}
if ((glyf_table) != (Default::default())) {
if ((glyf_table) != (std::ptr::null())) {
if ((((((*glyf_table).flags) & (woff2_kWoff2FlagsTransform))
!= (((*loca_table).flags) & (woff2_kWoff2FlagsTransform))) as i64)
!= 0)
Expand Down
20 changes: 10 additions & 10 deletions woff2/out/unsafe/src/bin/woff2_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ impl woff2_Buffer {
}
pub unsafe fn Skip(&mut self, mut n_bytes: u64) -> bool {
return (unsafe {
let _data: *mut u8 = Default::default();
let _data: *mut u8 = std::ptr::null_mut();
let _n_bytes: u64 = n_bytes;
self.Read(_data, _n_bytes)
});
Expand Down Expand Up @@ -696,7 +696,7 @@ impl woff2_Font {
return if it
== UnsafeMapIterator::end(&self.tables as *const BTreeMap<u32, Box<woff2_Font_Table>>)
{
Default::default()
std::ptr::null_mut()
} else {
(&mut *it.second() as *mut woff2_Font_Table)
};
Expand All @@ -711,7 +711,7 @@ impl woff2_Font {
return if it
== UnsafeMapIterator::end(&self.tables as *const BTreeMap<u32, Box<woff2_Font_Table>>)
{
Default::default()
std::ptr::null()
} else {
(&*it.second() as *const woff2_Font_Table)
};
Expand Down Expand Up @@ -796,7 +796,7 @@ pub unsafe fn ReadTrueTypeFont_15(
'loop_: while ((i as i32) < ((*font).num_tables as i32)) {
let mut table: woff2_Font_Table = <woff2_Font_Table>::default();
table.flag_byte = 0_u8;
table.reuse_of = Default::default();
table.reuse_of = std::ptr::null_mut();
if (((!(unsafe {
let _value: *mut u32 = (&mut table.tag as *mut u32);
(*file).ReadU32(_value)
Expand Down Expand Up @@ -846,7 +846,7 @@ pub unsafe fn ReadTrueTypeFont_15(
(*font).FindTable_u32(_tag)
})
.cast_const();
if ((head_table) != (Default::default())) && (((*head_table).length) < (52_u32)) {
if ((head_table) != (std::ptr::null())) && (((*head_table).length) < (52_u32)) {
return false;
}
return true;
Expand Down Expand Up @@ -1324,7 +1324,7 @@ pub unsafe fn NumGlyphs_27(font: *const woff2_Font) -> i32 {
let _tag: u32 = woff2_kLocaTableTag;
(*font).FindTable_u32_const(_tag)
});
if (((head_table) == (Default::default())) || ((loca_table) == (Default::default())))
if (((head_table) == (std::ptr::null())) || ((loca_table) == (std::ptr::null())))
|| (((*head_table).length) < (52_u32))
{
return 0;
Expand All @@ -1345,14 +1345,14 @@ pub unsafe fn IndexFormat_28(font: *const woff2_Font) -> i32 {
let _tag: u32 = woff2_kHeadTableTag;
(*font).FindTable_u32_const(_tag)
});
if ((head_table) == (Default::default())) {
if ((head_table) == (std::ptr::null())) {
return 0;
}
return ((*(*head_table).data.offset((51) as isize)) as i32);
}
impl woff2_Font_Table {
pub unsafe fn IsReused(&self) -> bool {
return ((self.reuse_of) != (Default::default()));
return ((self.reuse_of) != (std::ptr::null_mut()));
}
}
pub unsafe fn GetGlyphData_29(
Expand All @@ -1376,8 +1376,8 @@ pub unsafe fn GetGlyphData_29(
let _tag: u32 = woff2_kGlyfTableTag;
(*font).FindTable_u32_const(_tag)
});
if ((((head_table) == (Default::default())) || ((loca_table) == (Default::default())))
|| ((glyf_table) == (Default::default())))
if ((((head_table) == (std::ptr::null())) || ((loca_table) == (std::ptr::null())))
|| ((glyf_table) == (std::ptr::null())))
|| (((*head_table).length) < (52_u32))
{
return false;
Expand Down