jan/klamath-rs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Jan Petykiewicz 2025-04-22 20:17:17 -07:00
parent 78d1d6e7de
commit 029662d887
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/elements.rs
View File

@ -131,11 +131,6 @@ pub fn read_path<'a>(
let (input, layer) = LAYER::skip_and_read(input)?; let (input, layer) = LAYER::skip_and_read(input)?;
let (input, dtype) = DATATYPE::read(input)?; let (input, dtype) = DATATYPE::read(input)?;
insert_layer(layer, dtype, layers, path_builder, 0); insert_layer(layer, dtype, layers, path_builder, 0);
//let layer32 = (layer as u16 as u32) << 16) | (dtype as u16 as u32)
//let next_id = layers.len();
//let id = layers.entry(layer32).or_insert(next_id.try_into().unwrap());
//let layer_builder = path_builder.field_builder::<UInt32Builder>(0).unwrap();
//layer_builder.append_value((id);
let mut path_type = None; let mut path_type = None;
let mut width = None; let mut width = None;
@ -413,8 +408,8 @@ pub fn read_ref<'a>(
let xy_builder = ref_builder.field_builder::<UInt64Builder>(4).unwrap(); let xy_builder = ref_builder.field_builder::<UInt64Builder>(4).unwrap();
xy_builder.append_value(xy); xy_builder.append_value(xy);
println!("ref, {is_aref:?}");
let rep_builder = ref_builder.field_builder::<StructBuilder>(5).unwrap(); let rep_builder = ref_builder.field_builder::<StructBuilder>(5).unwrap();
// println!("ref, {is_aref:?}");
if is_aref { if is_aref {
if colrow.is_none() { if colrow.is_none() {
return fail(input, "AREF without COLROW before XY".to_string()) return fail(input, "AREF without COLROW before XY".to_string())

2
src/library.rs
View File

@ -259,7 +259,7 @@ pub fn read_library(input: &[u8]) -> IResult<StructArray> {
let name_bytes; let name_bytes;
(input, name_bytes) = records::STRNAME::read(input)?; (input, name_bytes) = records::STRNAME::read(input)?;
let name = String::from_utf8(name_bytes).unwrap(); let name = String::from_utf8(name_bytes).unwrap();
println!("{name}"); //println!("{name}");
let next_id = names.len(); let next_id = names.len();
let id = names.entry(name).or_insert(next_id.try_into().unwrap()); let id = names.entry(name).or_insert(next_id.try_into().unwrap());