michael/exif-rs
michael
/
exif-rs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use ..= for inclusive range pattern.

This commit is contained in:
KAMADA Ken'ichi 2019-10-21 23:25:32 +09:00
parent f81d2f6e6a
commit 766822c791
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/dumpexif.rs
View File

@ -64,7 +64,7 @@ fn escape(bytes: &&[u8]) -> String {
for &c in *bytes { for &c in *bytes {
match c { match c {
b'\\' | b'"' => write!(buf, "\\{}", c as char).unwrap(), b'\\' | b'"' => write!(buf, "\\{}", c as char).unwrap(),
0x20...0x7e => buf.write_char(c as char).unwrap(), 0x20..=0x7e => buf.write_char(c as char).unwrap(),
_ => write!(buf, "\\x{:02x}", c).unwrap(), _ => write!(buf, "\\x{:02x}", c).unwrap(),
} }
} }

2
src/jpeg.rs
View File

@ -79,7 +79,7 @@ fn get_exif_attr_sub<R>(reader: &mut R)
} }
// Continue or return early on stand-alone markers. // Continue or return early on stand-alone markers.
match code { match code {
marker::Z | marker::TEM | marker::RST0...marker::RST7 => continue, marker::Z | marker::TEM | marker::RST0..=marker::RST7 => continue,
marker::SOI => return Err(Error::InvalidFormat("Unexpected SOI")), marker::SOI => return Err(Error::InvalidFormat("Unexpected SOI")),
marker::EOI => return Err(Error::NotFound("No Exif data found")), marker::EOI => return Err(Error::NotFound("No Exif data found")),
_ => {}, _ => {},

2
src/tag.rs
View File

@ -1493,7 +1493,7 @@ fn d_sub_ascii(w: &mut fmt::Write, bytes: &[u8]) -> fmt::Result {
w.write_char('\\')?; w.write_char('\\')?;
w.write_char(c as char)?; w.write_char(c as char)?;
}, },
0x20...0x7e => w.write_char(c as char)?, 0x20..=0x7e => w.write_char(c as char)?,
_ => write!(w, "\\x{:02x}", c)?, _ => write!(w, "\\x{:02x}", c)?,
} }
} }

4
src/writer.rs
View File

@ -441,13 +441,13 @@ fn write_ifd_and_fields<W, E>(
} }
if f.tag == Tag::StripOffsets { if f.tag == Tag::StripOffsets {
strip_offsets_offset = match valbuf.len() { strip_offsets_offset = match valbuf.len() {
0...4 => ifd_offset + ifd.len() as u32 - 4, 0..=4 => ifd_offset + ifd.len() as u32 - 4,
_ => get_offset(w)? - valbuf.len() as u32, _ => get_offset(w)? - valbuf.len() as u32,
}; };
} }
if f.tag == Tag::TileOffsets { if f.tag == Tag::TileOffsets {
tile_offsets_offset = match valbuf.len() { tile_offsets_offset = match valbuf.len() {
0...4 => ifd_offset + ifd.len() as u32 - 4, 0..=4 => ifd_offset + ifd.len() as u32 - 4,
_ => get_offset(w)? - valbuf.len() as u32, _ => get_offset(w)? - valbuf.len() as u32,
}; };
} }