From 0ae632c7f498ab2e94e4e4ccf6b4fe65ab5c25f6 Mon Sep 17 00:00:00 2001 From: Joshua Holmer Date: Fri, 4 Mar 2016 16:03:33 -0500 Subject: [PATCH] Revert "Enable `quiet` when `stdout` is selected" This reverts commit 849d36ec6cd7eb5dd6da01ac602d8f761b4b83e1. --- CHANGELOG.md | 1 - src/main.rs | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea721276..643dbfca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,6 @@ **Version 0.1.2** (unreleased) - Fix program version that is displayed when running `oxipng -V` - Ensure `--quiet` mode is actually quiet (@SethDusek [#20](https://github.com/shssoichiro/oxipng/pull/20)) - - Imply `--quiet` when `--stdout` is enabled - Use heuristics to determine best combination for `-o1` ([#21](https://github.com/shssoichiro/oxipng/issues/21)) **Version 0.1.1** diff --git a/src/main.rs b/src/main.rs index 59f1093f..fe163f0e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -95,7 +95,7 @@ fn main() { .conflicts_with("output_dir") .conflicts_with("stdout")) .arg(Arg::with_name("stdout") - .help("Write output to stdout (implies 'quiet')") + .help("Write output to stdout") .long("stdout") .conflicts_with("output_dir") .conflicts_with("output_file")) @@ -409,6 +409,10 @@ fn parse_opts_into_struct(matches: &ArgMatches, opts: &mut oxipng::Options) -> R opts.out_file = PathBuf::from(x); } + if matches.is_present("stdout") { + opts.stdout = true; + } + if matches.is_present("backup") { opts.backup = true; } @@ -445,11 +449,6 @@ fn parse_opts_into_struct(matches: &ArgMatches, opts: &mut oxipng::Options) -> R opts.verbosity = Some(1); } - if matches.is_present("stdout") { - opts.stdout = true; - opts.verbosity = None; - } - if matches.is_present("no-bit-reduction") { opts.bit_depth_reduction = false; }