danvics/oxipng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cargo fmt and clippy

Browse source
This commit is contained in:
Joshua Holmer 2016-01-11 01:06:12 -05:00
parent 11e475ba15
commit acc0b6c5ac
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/png.rs
View file

@ -303,7 +303,7 @@ impl PngData {
2 => { 2 => {
let mut data = Vec::with_capacity(line.data.len()); let mut data = Vec::with_capacity(line.data.len());
for (i, byte) in line.data.iter().enumerate() { for (i, byte) in line.data.iter().enumerate() {
if last_line.len() > 0 { if !last_line.is_empty() {
data.push(byte.wrapping_add(last_line[i])); data.push(byte.wrapping_add(last_line[i]));
} else { } else {
data.push(*byte); data.push(*byte);
@ -315,9 +315,11 @@ impl PngData {
3 => { 3 => {
let mut data = Vec::with_capacity(line.data.len()); let mut data = Vec::with_capacity(line.data.len());
for (i, byte) in line.data.iter().enumerate() { for (i, byte) in line.data.iter().enumerate() {
if last_line.len() > 0 { if !last_line.is_empty() {
data.push(match i.checked_sub(bpp as usize) { data.push(match i.checked_sub(bpp as usize) {
Some(x) => byte.wrapping_add(((line.data[x] as u16 + last_line[i] as u16) >> 1) as u8), Some(x) => byte.wrapping_add(
((line.data[x] as u16 + last_line[i] as u16) >> 1) as u8
),
None => byte.wrapping_add(last_line[i] >> 1), None => byte.wrapping_add(last_line[i] >> 1),
}); });
} else { } else {
@ -333,7 +335,7 @@ impl PngData {
4 => { 4 => {
let mut data = Vec::with_capacity(line.data.len()); let mut data = Vec::with_capacity(line.data.len());
for (i, byte) in line.data.iter().enumerate() { for (i, byte) in line.data.iter().enumerate() {
if last_line.len() > 0 { if !last_line.is_empty() {
data.push(match i.checked_sub(bpp as usize) { data.push(match i.checked_sub(bpp as usize) {
Some(x) => { Some(x) => {
byte.wrapping_add(paeth_predictor(line.data[x], byte.wrapping_add(paeth_predictor(line.data[x],
@ -374,7 +376,7 @@ impl PngData {
0 => { 0 => {
let mut data = line.data.clone(); let mut data = line.data.clone();
filtered.append(&mut data); filtered.append(&mut data);
}, }
1 => { 1 => {
for (i, byte) in line.data.iter().enumerate() { for (i, byte) in line.data.iter().enumerate() {
filtered.push(match i.checked_sub(bpp as usize) { filtered.push(match i.checked_sub(bpp as usize) {
@ -385,7 +387,7 @@ impl PngData {
} }
2 => { 2 => {
for (i, byte) in line.data.iter().enumerate() { for (i, byte) in line.data.iter().enumerate() {
if last_line.len() > 0 { if !last_line.is_empty() {
filtered.push(byte.wrapping_sub(last_line[i])); filtered.push(byte.wrapping_sub(last_line[i]));
} else { } else {
filtered.push(*byte); filtered.push(*byte);
@ -394,9 +396,11 @@ impl PngData {
} }
3 => { 3 => {
for (i, byte) in line.data.iter().enumerate() { for (i, byte) in line.data.iter().enumerate() {
if last_line.len() > 0 { if !last_line.is_empty() {
filtered.push(match i.checked_sub(bpp as usize) { filtered.push(match i.checked_sub(bpp as usize) {
Some(x) => byte.wrapping_sub(((line.data[x] as u16 + last_line[i] as u16) >> 1) as u8), Some(x) => byte.wrapping_sub(
((line.data[x] as u16 + last_line[i] as u16) >> 1) as u8
),
None => byte.wrapping_sub(last_line[i] >> 1), None => byte.wrapping_sub(last_line[i] >> 1),
}); });
} else { } else {
@ -409,7 +413,7 @@ impl PngData {
} }
4 => { 4 => {
for (i, byte) in line.data.iter().enumerate() { for (i, byte) in line.data.iter().enumerate() {
if last_line.len() > 0 { if !last_line.is_empty() {
filtered.push(match i.checked_sub(bpp as usize) { filtered.push(match i.checked_sub(bpp as usize) {
Some(x) => { Some(x) => {
byte.wrapping_sub(paeth_predictor(line.data[x], byte.wrapping_sub(paeth_predictor(line.data[x],
@ -440,22 +444,24 @@ impl PngData {
let mut line_3 = Vec::with_capacity(line.data.len()); let mut line_3 = Vec::with_capacity(line.data.len());
let mut line_4 = Vec::with_capacity(line.data.len()); let mut line_4 = Vec::with_capacity(line.data.len());
for (i, byte) in line.data.iter().enumerate() { for (i, byte) in line.data.iter().enumerate() {
if last_line.len() > 0 { if !last_line.is_empty() {
match i.checked_sub(bpp as usize) { match i.checked_sub(bpp as usize) {
Some(x) => { Some(x) => {
line_1.push(byte.wrapping_sub(line.data[x])); line_1.push(byte.wrapping_sub(line.data[x]));
line_2.push(byte.wrapping_sub(last_line[i])); line_2.push(byte.wrapping_sub(last_line[i]));
line_3.push(byte.wrapping_sub(((line.data[x] as u16 + last_line[i] as u16) >> 1) as u8)); line_3.push(byte.wrapping_sub(
((line.data[x] as u16 + last_line[i] as u16) >> 1) as u8)
);
line_4.push(byte.wrapping_sub(paeth_predictor(line.data[x], line_4.push(byte.wrapping_sub(paeth_predictor(line.data[x],
last_line[i], last_line[i],
last_line[x]))); last_line[x])));
}, }
None => { None => {
line_1.push(*byte); line_1.push(*byte);
line_2.push(byte.wrapping_sub(last_line[i])); line_2.push(byte.wrapping_sub(last_line[i]));
line_3.push(byte.wrapping_sub(last_line[i] >> 1)); line_3.push(byte.wrapping_sub(last_line[i] >> 1));
line_4.push(byte.wrapping_sub(last_line[i])); line_4.push(byte.wrapping_sub(last_line[i]));
}, }
} }
} else { } else {
match i.checked_sub(bpp as usize) { match i.checked_sub(bpp as usize) {
@ -464,13 +470,13 @@ impl PngData {
line_2.push(*byte); line_2.push(*byte);
line_3.push(byte.wrapping_sub(line.data[x] >> 1)); line_3.push(byte.wrapping_sub(line.data[x] >> 1));
line_4.push(byte.wrapping_sub(line.data[x])); line_4.push(byte.wrapping_sub(line.data[x]));
}, }
None => { None => {
line_1.push(*byte); line_1.push(*byte);
line_2.push(*byte); line_2.push(*byte);
line_3.push(*byte); line_3.push(*byte);
line_4.push(*byte); line_4.push(*byte);
}, }
} }
}; };
} }