liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

swf: Use bitflags for `LineStyleFlag`

This commit is contained in:
relrelb 2022-03-18 15:07:13 +02:00 committed by Mike Welsh
parent e88c7102f5
commit fd06fa0537
3 changed files with 77 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
swf/src/read.rs
View File

@ -1367,24 +1367,25 @@ impl<'a> Reader<'a> {
)) ))
} else { } else {
// MorphLineStyle2 in DefineMorphShape2. // MorphLineStyle2 in DefineMorphShape2.
let flags0 = self.read_u8()?; let flags = LineStyleFlag::from_bits_truncate(self.read_u16()?);
let flags1 = self.read_u8()?; let is_pixel_hinted = flags.contains(LineStyleFlag::PIXEL_HINTING);
let start_cap = LineCapStyle::from_u8(flags0 >> 6) let allow_scale_y = !flags.contains(LineStyleFlag::NO_V_SCALE);
.ok_or_else(|| Error::invalid_data("Invalid line cap type."))?; let allow_scale_x = !flags.contains(LineStyleFlag::NO_H_SCALE);
let join_style_id = (flags0 >> 4) & 0b11; let has_fill = flags.contains(LineStyleFlag::HAS_FILL);
let has_fill = (flags0 & 0b1000) != 0; let join_style = match flags & LineStyleFlag::JOIN_STYLE {
let allow_scale_x = (flags0 & 0b100) == 0; LineStyleFlag::ROUND => LineJoinStyle::Round,
let allow_scale_y = (flags0 & 0b10) == 0; LineStyleFlag::BEVEL => LineJoinStyle::Bevel,
let is_pixel_hinted = (flags0 & 0b1) != 0; LineStyleFlag::MITER => LineJoinStyle::Miter(self.read_fixed8()?),
let allow_close = (flags1 & 0b100) == 0;
let end_cap = LineCapStyle::from_u8(flags1 & 0b11)
.ok_or_else(|| Error::invalid_data("Invalid line cap type."))?;
let join_style = match join_style_id {
0 => LineJoinStyle::Round,
1 => LineJoinStyle::Bevel,
2 => LineJoinStyle::Miter(self.read_fixed8()?),
_ => return Err(Error::invalid_data("Invalid line cap type.")), _ => return Err(Error::invalid_data("Invalid line cap type.")),
}; };
let start_cap =
LineCapStyle::from_u8(((flags & LineStyleFlag::START_CAP_STYLE).bits() >> 6) as u8)
.ok_or_else(|| Error::invalid_data("Invalid line cap type."))?;
let end_cap =
LineCapStyle::from_u8(((flags & LineStyleFlag::END_CAP_STYLE).bits() >> 8) as u8)
.ok_or_else(|| Error::invalid_data("Invalid line cap type."))?;
let allow_close = !flags.contains(LineStyleFlag::ALLOW_CLOSE);
let (start_color, end_color) = if !has_fill { let (start_color, end_color) = if !has_fill {
(self.read_rgba()?, self.read_rgba()?) (self.read_rgba()?, self.read_rgba()?)
} else { } else {
@ -1681,37 +1682,36 @@ impl<'a> Reader<'a> {
} }
fn read_line_style(&mut self, shape_version: u8) -> Result<LineStyle> { fn read_line_style(&mut self, shape_version: u8) -> Result<LineStyle> {
let width = Twips::new(self.read_u16()?);
if shape_version < 4 { if shape_version < 4 {
// LineStyle1 // LineStyle1
Ok(LineStyle::new_v1( let color = if shape_version >= 3 {
Twips::new(self.read_u16()?), self.read_rgba()?
if shape_version >= 3 { } else {
self.read_rgba()? self.read_rgb()?
} else { };
self.read_rgb()? Ok(LineStyle::new_v1(width, color))
},
))
} else { } else {
// LineStyle2 in DefineShape4 // LineStyle2 in DefineShape4
let width = Twips::new(self.read_u16()?); let flags = LineStyleFlag::from_bits_truncate(self.read_u16()?);
let flags0 = self.read_u8()?; let is_pixel_hinted = flags.contains(LineStyleFlag::PIXEL_HINTING);
let flags1 = self.read_u8()?; let allow_scale_y = !flags.contains(LineStyleFlag::NO_V_SCALE);
let start_cap = LineCapStyle::from_u8(flags0 >> 6) let allow_scale_x = !flags.contains(LineStyleFlag::NO_H_SCALE);
.ok_or_else(|| Error::invalid_data("Invalid line cap type."))?; let has_fill = flags.contains(LineStyleFlag::HAS_FILL);
let join_style_id = (flags0 >> 4) & 0b11; let join_style = match flags & LineStyleFlag::JOIN_STYLE {
let has_fill = (flags0 & 0b1000) != 0; LineStyleFlag::ROUND => LineJoinStyle::Round,
let allow_scale_x = (flags0 & 0b100) == 0; LineStyleFlag::BEVEL => LineJoinStyle::Bevel,
let allow_scale_y = (flags0 & 0b10) == 0; LineStyleFlag::MITER => LineJoinStyle::Miter(self.read_fixed8()?),
let is_pixel_hinted = (flags0 & 0b1) != 0;
let allow_close = (flags1 & 0b100) == 0;
let end_cap = LineCapStyle::from_u8(flags1 & 0b11)
.ok_or_else(|| Error::invalid_data("Invalid line cap type."))?;
let join_style = match join_style_id {
0 => LineJoinStyle::Round,
1 => LineJoinStyle::Bevel,
2 => LineJoinStyle::Miter(self.read_fixed8()?),
_ => return Err(Error::invalid_data("Invalid line cap type.")), _ => return Err(Error::invalid_data("Invalid line cap type.")),
}; };
let start_cap =
LineCapStyle::from_u8(((flags & LineStyleFlag::START_CAP_STYLE).bits() >> 6) as u8)
.ok_or_else(|| Error::invalid_data("Invalid line cap type."))?;
let end_cap =
LineCapStyle::from_u8(((flags & LineStyleFlag::END_CAP_STYLE).bits() >> 8) as u8)
.ok_or_else(|| Error::invalid_data("Invalid line cap type."))?;
let allow_close = !flags.contains(LineStyleFlag::ALLOW_CLOSE);
let color = if !has_fill { let color = if !has_fill {
self.read_rgba()? self.read_rgba()?
} else { } else {

21
swf/src/types.rs
View File

@ -1145,6 +1145,27 @@ impl LineStyle {
} }
} }
bitflags! {
pub struct LineStyleFlag: u16 {
// First byte.
const PIXEL_HINTING = 1 << 0;
const NO_V_SCALE = 1 << 1;
const NO_H_SCALE = 1 << 2;
const HAS_FILL = 1 << 3;
const JOIN_STYLE = 0b11 << 4;
const START_CAP_STYLE = 0b11 << 6;
// Second byte.
const END_CAP_STYLE = 0b11 << 8;
const ALLOW_CLOSE = 1 << 10;
// JOIN_STYLE mask values.
const ROUND = 0b00 << 4;
const BEVEL = 0b01 << 4;
const MITER = 0b10 << 4;
}
}
#[derive(Debug, PartialEq, Clone, Copy, FromPrimitive)] #[derive(Debug, PartialEq, Clone, Copy, FromPrimitive)]
pub enum LineCapStyle { pub enum LineCapStyle {
Round = 0, Round = 0,

33
swf/src/write.rs
View File

@ -1622,25 +1622,22 @@ impl<W: Write> Writer<W> {
// TODO(Herschel): Handle overflow. // TODO(Herschel): Handle overflow.
self.write_u16(line_style.width.get() as u16)?; self.write_u16(line_style.width.get() as u16)?;
if shape_version >= 4 { if shape_version >= 4 {
let mut bits = self.bits();
// LineStyle2 // LineStyle2
bits.write_ubits(2, line_style.start_cap as u32)?; let mut flags = LineStyleFlag::empty();
bits.write_ubits( flags.set(LineStyleFlag::PIXEL_HINTING, line_style.is_pixel_hinted);
2, flags.set(LineStyleFlag::NO_V_SCALE, !line_style.allow_scale_y);
match line_style.join_style { flags.set(LineStyleFlag::NO_H_SCALE, !line_style.allow_scale_x);
LineJoinStyle::Round => 0, flags.set(LineStyleFlag::HAS_FILL, line_style.fill_style.is_some());
LineJoinStyle::Bevel => 1, flags |= match line_style.join_style {
LineJoinStyle::Miter(_) => 2, LineJoinStyle::Round => LineStyleFlag::ROUND,
}, LineJoinStyle::Bevel => LineStyleFlag::BEVEL,
)?; LineJoinStyle::Miter(_) => LineStyleFlag::MITER,
bits.write_bit(line_style.fill_style.is_some())?; };
bits.write_bit(!line_style.allow_scale_x)?; let mut flags = flags.bits();
bits.write_bit(!line_style.allow_scale_y)?; flags |= (line_style.start_cap as u16) << 6;
bits.write_bit(line_style.is_pixel_hinted)?; flags |= (line_style.end_cap as u16) << 8;
bits.write_ubits(5, 0)?; self.write_u16(flags)?;
bits.write_bit(!line_style.allow_close)?;
bits.write_ubits(2, line_style.end_cap as u32)?;
drop(bits);
if let LineJoinStyle::Miter(miter_factor) = line_style.join_style { if let LineJoinStyle::Miter(miter_factor) = line_style.join_style {
self.write_fixed8(miter_factor)?; self.write_fixed8(miter_factor)?;
} }