From 0c2e3777b190696a1b74ff5363a9cae158c6c1c0 Mon Sep 17 00:00:00 2001 From: Josh Holmer Date: Tue, 30 Jan 2018 22:27:34 -0500 Subject: [PATCH] Refactor an if statement --- src/png/mod.rs | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/png/mod.rs b/src/png/mod.rs index 5f1e9a90..afa163d7 100644 --- a/src/png/mod.rs +++ b/src/png/mod.rs @@ -271,19 +271,13 @@ impl PngData { for line in self.scan_lines() { match filter { 0 | 1 | 2 | 3 | 4 => { - if last_pass == line.pass || filter <= 1 { - filtered.push(filter); - filtered.extend_from_slice(&filter_line( - filter, - bpp, - &line.data, - &last_line, - )); + let filter = if last_pass == line.pass || filter <= 1 { + filter } else { - // Avoid vertical filtering on first line of each interlacing pass - filtered.push(0); - filtered.extend_from_slice(&filter_line(0, bpp, &line.data, &last_line)); - } + 0 + }; + filtered.push(filter); + filtered.extend_from_slice(&filter_line(filter, bpp, &line.data, &last_line)); } 5 => { // Heuristically guess best filter per line