formatting
parent
92a845c02e
commit
e412a5e0ec
|
@ -25,17 +25,8 @@ pub fn read_bitmap_area(mut im: Image8,
|
|||
let left = c_u16b(b, p + 4)? as usize;
|
||||
let bottom = c_u16b(b, p + 6)? as usize;
|
||||
let right = c_u16b(b, p + 8)? as usize;
|
||||
// version = c_u16b(b, p+10)?;
|
||||
let pack_typ = c_u16b(b, p + 12)?;
|
||||
// pack_siz = c_u32b(b, p+14)?;
|
||||
// horz_dpi = c_u32b(b, p+18)?;
|
||||
// vert_dpi = c_u32b(b, p+22)?;
|
||||
// format = c_u16b(b, p+26)?;
|
||||
let depth = c_u16b(b, p + 28)?;
|
||||
// comp_n = c_u16b(b, p+30)?;
|
||||
// comp_d = c_u16b(b, p+32)?;
|
||||
// planeofs = c_u32b(b, p+34)?;
|
||||
// clut_id = c_u32b(b, p+38)?;
|
||||
|
||||
if pitch_fl & 0x8000 == 0 {
|
||||
bail!("PICT1 not supported");
|
||||
|
@ -178,12 +169,9 @@ pub fn read_quicktime_c(_im: Image8, _b: &[u8]) -> ResultS<Image8>
|
|||
/// Load a PICT image.
|
||||
pub fn load_pict(b: &[u8]) -> ResultS<Image8>
|
||||
{
|
||||
// size = c_u16b(b, 0)?;
|
||||
// top = c_u16b(b, 2)?;
|
||||
// left = c_u16b(b, 4)?;
|
||||
let h = c_u16b(b, 6)? as usize;
|
||||
let w = c_u16b(b, 8)? as usize;
|
||||
let im = Image8::new(w, h);
|
||||
let h = c_u16b(b, 6)? as usize;
|
||||
let w = c_u16b(b, 8)? as usize;
|
||||
let im = Image8::new(w, h);
|
||||
|
||||
let mut p = 10; // size of header
|
||||
|
||||
|
@ -276,7 +264,6 @@ pub fn load_pict(b: &[u8]) -> ResultS<Image8>
|
|||
/// Read a colorTable structure.
|
||||
pub fn get_clut(b: &[u8]) -> ResultS<(Vec<Color8>, usize)>
|
||||
{
|
||||
// sed = c_u32b(b, 0)?;
|
||||
let dev = c_u16b(b, 4)? & 0x8000 != 0;
|
||||
let num = c_u16b(b, 6)? as usize + 1;
|
||||
|
||||
|
|
|
@ -114,10 +114,6 @@ fn frame(b: &[u8]) -> ResultS<Frame>
|
|||
let flags = c_u16b(b, 0)?;
|
||||
let min_lt = c_u32b(b, 2)?;
|
||||
let bmp_ind = c_u16b(b, 6)? as usize;
|
||||
// orig_x = c_i16b(b, 8)?;
|
||||
// orig_y = c_i16b(b, 10)?;
|
||||
// key_x = c_i16b(b, 12)?;
|
||||
// key_y = c_i16b(b, 14)?;
|
||||
let wrl_l = c_i16b(b, 16)?;
|
||||
let wrl_r = c_i16b(b, 18)?;
|
||||
let wrl_t = c_i16b(b, 20)?;
|
||||
|
@ -146,8 +142,6 @@ fn frm_coll(b: &[u8], ofs: usize, num: usize) -> ResultS<Vec<Frame>>
|
|||
|
||||
fn sequence(b: &[u8]) -> ResultS<Sequence>
|
||||
{
|
||||
// sq_type = c_u16b(b, 0)?;
|
||||
// flags = c_u16b(b, 2)?;
|
||||
let name = c_data(b, 4..38)?;
|
||||
let v_type = c_u16b(b, 38)?;
|
||||
let frames = c_u16b(b, 40)?;
|
||||
|
@ -158,7 +152,6 @@ fn sequence(b: &[u8]) -> ResultS<Sequence>
|
|||
let snd_beg = c_u16b(b, 50)?;
|
||||
let snd_key = c_u16b(b, 52)?;
|
||||
let snd_end = c_u16b(b, 54)?;
|
||||
// xform = c_u16b(b, 56)?;
|
||||
let loop_f = c_u16b(b, 58)?;
|
||||
let name = mac_roman_conv(ok!(pascal_str(name), "bad string")?);
|
||||
let v_type = ViewType::from_repr(v_type)?;
|
||||
|
@ -188,7 +181,6 @@ fn collection(b: &[u8]) -> ResultS<Collection>
|
|||
{
|
||||
let version = c_u16b(b, 0)?;
|
||||
let cl_type = c_u16b(b, 2)?;
|
||||
// flags = c_u16b(b, 4)?;
|
||||
let clr_num = c_u16b(b, 6)? as usize;
|
||||
let tab_num = c_u16b(b, 8)? as usize;
|
||||
let tab_ofs = c_u32b(b, 10)? as usize;
|
||||
|
@ -198,8 +190,6 @@ fn collection(b: &[u8]) -> ResultS<Collection>
|
|||
let frm_ofs = c_u32b(b, 22)? as usize;
|
||||
let bmp_num = c_u16b(b, 26)? as usize;
|
||||
let bmp_ofs = c_u32b(b, 28)? as usize;
|
||||
// xform = c_i16b(b, 30)?;
|
||||
// size = c_u32b(b, 32)? as usize;
|
||||
let cl_type = CollectionType::from_repr(cl_type)?;
|
||||
|
||||
if version != 3 {
|
||||
|
@ -236,10 +226,8 @@ pub fn testfn_replaceme(b: &[u8]) -> ResultS<Vec<CollectionDef>>
|
|||
let mut p = 0;
|
||||
|
||||
for _ in 0..32 {
|
||||
// status = c_u16b(b, p + 0)?;
|
||||
// flags = c_u16b(b, p + 2)?;
|
||||
let lo_ofs = c_u32b(b, p + 4)? as usize;
|
||||
let lo_len = c_u32b(b, p + 8)? as usize;
|
||||
let lo_ofs = c_u32b(b, p + 4)? as usize;
|
||||
let lo_len = c_u32b(b, p + 8)? as usize;
|
||||
let hi_ofs = c_u32b(b, p + 12)? as usize;
|
||||
let hi_len = c_u32b(b, p + 16)? as usize;
|
||||
|
||||
|
|
|
@ -3,7 +3,6 @@ use std::fmt;
|
|||
|
||||
fn read_group(b: &[u8], text: &[u8]) -> ResultS<Group>
|
||||
{
|
||||
// flags = c_u16b(b, 0)?;
|
||||
let ttype = c_u16b(b, 2)?;
|
||||
let pdata = c_i16b(b, 4)?;
|
||||
let start = c_u16b(b, 6)? as usize;
|
||||
|
|
|
@ -10,13 +10,11 @@ impl Wad<'_>
|
|||
let wadver = c_u16b(b, 0)?;
|
||||
let dataver = c_u16b(b, 2)?;
|
||||
let origname = c_data(b, 4..68)?;
|
||||
// crc = c_u32b(b, 68)?;
|
||||
let dirofs = c_u32b(b, 72)? as usize;
|
||||
let numents = c_u16b(b, 76)? as usize;
|
||||
let appsize = c_u16b(b, 78)? as usize;
|
||||
let wcnksize = c_u16b(b, 80)? as usize;
|
||||
let wentsize = c_u16b(b, 82)? as usize;
|
||||
// parent = c_u32b(b, 84)?;
|
||||
let wadver = Ver::from_repr(wadver)?;
|
||||
let origname = mac_roman_conv(origname);
|
||||
|
||||
|
@ -67,9 +65,7 @@ fn get_chunks(b: &[u8], cnksize: usize) -> ResultS<ChunkMap>
|
|||
|
||||
while p < b.len() {
|
||||
let iden = c_iden(b, p)?;
|
||||
// ofs = c_u32b(b, p+ 4)?;
|
||||
let size = c_u32b(b, p + 8)? as usize;
|
||||
// pofs = c_u32b(b, p+12)?;
|
||||
let beg = p + cnksize;
|
||||
let end = beg + size;
|
||||
chunks.insert(iden, c_data(b, beg..end)?);
|
||||
|
|
Loading…
Reference in New Issue