use a bit more modern Rust idioms

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

diff --git a/src/frmwriter.rs b/src/frmwriter.rs
index c743fc0132fbf5f6fae2bc44898c16dd73ec0ed1..57141cd4daea4d58718ab3dac36828c261758405 100644 (file)
--- a/src/frmwriter.rs
+++ b/src/frmwriter.rs
@@ -3,9 +3,8 @@ extern crate nihav_core;
 use nihav_core::frame::*;
 use std::io::prelude::*;
 use std::fs::File;
-use std::cell::Ref;
 
-pub fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frm: Ref<NAFrame>) {
+pub fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) {
     if let NABufferType::None = frm.get_buffer() { return; }
     let name = format!("{}out{:02}_{:08}.pgm", pfx, strno, num);
     let mut ofile = File::create(name).unwrap();
@@ -25,8 +24,7 @@ pub fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frm: Ref<NAFrame>) {
     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();
@@ -64,7 +62,7 @@ pub fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frm: Ref<NAFrame>) {
     }
 }
 
-pub fn write_palppm(pfx: &str, strno: usize, num: u64, frm: Ref<NAFrame>) {
+pub fn write_palppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) {
     let name = format!("{}out{:02}_{:08}.ppm", pfx, strno, num);
     let mut ofile = File::create(name).unwrap();
     let buf = frm.get_buffer().get_vbuf().unwrap();
@@ -80,8 +78,7 @@ pub fn write_palppm(pfx: &str, strno: usize, num: u64, frm: Ref<NAFrame>) {
             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 {
@@ -95,7 +92,7 @@ pub fn write_palppm(pfx: &str, strno: usize, num: u64, frm: Ref<NAFrame>) {
     }
 }
 
-pub fn write_ppm(pfx: &str, strno: usize, num: u64, frm: Ref<NAFrame>) {
+pub fn write_ppm(pfx: &str, strno: usize, num: u64, frm: NAFrameRef) {
     let name = format!("{}out{:02}_{:08}.ppm", pfx, strno, num);
     let mut ofile = File::create(name).unwrap();
     if let NABufferType::VideoPacked(ref buf) = frm.get_buffer() {
@@ -110,8 +107,7 @@ pub fn write_ppm(pfx: &str, strno: usize, num: u64, frm: Ref<NAFrame>) {
                 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]];
@@ -141,8 +137,7 @@ pub fn write_ppm(pfx: &str, strno: usize, num: u64, frm: Ref<NAFrame>) {
                 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];