use a bit more modern Rust idioms

[nihav-tool.git] / src / frmwriter.rs

diff --git a/src/frmwriter.rs b/src/frmwriter.rs
index a9c0612d81e0c438f862817a175ebb42988537de..57141cd4daea4d58718ab3dac36828c261758405 100644 (file)
--- a/src/frmwriter.rs
+++ b/src/frmwriter.rs
@@ -24,8 +24,7 @@ pub fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) {
     let ls = buf.get_stride(0);
     let mut idx = 0;
     let mut idx2 = w;
     let ls = buf.get_stride(0);
     let mut idx = 0;
     let mut idx2 = w;

-    let mut pad: Vec<u8> = Vec::with_capacity((w - w2 * 2) / 2);
-    pad.resize((w - w2 * 2) / 2, 0xFF);
+    let pad: Vec<u8> = vec![0xFF; (w - w2 * 2) / 2];

     for _ in 0..h {
         let line = &dta[idx..idx2];
         ofile.write_all(line).unwrap();
     for _ in 0..h {
         let line = &dta[idx..idx2];
         ofile.write_all(line).unwrap();


@@ -79,8 +78,7 @@ pub fn write_palppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) {
             buf.get_info().get_format().get_chromaton(2).unwrap().get_offset() as usize
         ];
     let mut idx  = 0;
             buf.get_info().get_format().get_chromaton(2).unwrap().get_offset() as usize
         ];
     let mut idx  = 0;

-    let mut line: Vec<u8> = Vec::with_capacity(w * 3);
-    line.resize(w * 3, 0);
+    let mut line: Vec<u8> = vec![0; w * 3];

     for _ in 0..h {
         let src = &dta[idx..(idx+w)];
         for x in 0..w {
     for _ in 0..h {
         let src = &dta[idx..(idx+w)];
         for x in 0..w {


@@ -109,8 +107,7 @@ pub fn write_ppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) {
                 buf.get_info().get_format().get_chromaton(2).unwrap().get_offset() as usize
             ];
         let step = buf.get_info().get_format().get_elem_size() as usize;
                 buf.get_info().get_format().get_chromaton(2).unwrap().get_offset() as usize
             ];
         let step = buf.get_info().get_format().get_elem_size() as usize;

-        let mut line: Vec<u8> = Vec::with_capacity(w * 3);
-        line.resize(w * 3, 0);
+        let mut line: Vec<u8> = vec![0; w * 3];

         for src in dta.chunks(stride) {
             for x in 0..w {
                 line[x * 3 + 0] = src[x * step + offs[0]];
         for src in dta.chunks(stride) {
             for x in 0..w {
                 line[x * 3 + 0] = src[x * step + offs[0]];


@@ -140,8 +137,7 @@ pub fn write_ppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) {
                 buf.get_info().get_format().get_chromaton(1).unwrap().get_shift(),
                 buf.get_info().get_format().get_chromaton(2).unwrap().get_shift()
             ];
                 buf.get_info().get_format().get_chromaton(1).unwrap().get_shift(),
                 buf.get_info().get_format().get_chromaton(2).unwrap().get_shift()
             ];

-        let mut line: Vec<u8> = Vec::with_capacity(w * 3);
-        line.resize(w * 3, 0);
+        let mut line: Vec<u8> = vec![0; w * 3];

         for src in dta.chunks(stride) {
             for x in 0..w {
                 let elem = src[x];
         for src in dta.chunks(stride) {
             for x in 0..w {
                 let elem = src[x];