From 4ff439ed79538f1a0eca3847830fe1c0dfa84c31 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 24 Nov 2017 13:12:43 +0000 Subject: [PATCH] A couple of improvements to convert cmd, fail if format isn't explicit --- renderdoccmd/renderdoccmd.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/renderdoccmd/renderdoccmd.cpp b/renderdoccmd/renderdoccmd.cpp index f6403bfc3..d8c922b84 100644 --- a/renderdoccmd/renderdoccmd.cpp +++ b/renderdoccmd/renderdoccmd.cpp @@ -664,14 +664,14 @@ struct ConvertCommand : public Command if(infile.empty()) { - std::cerr << "Need an input filename." << std::endl; + std::cerr << "Need an input filename (-f)." << std::endl << std::endl; std::cerr << parser.usage() << std::endl; return 1; } if(outfile.empty()) { - std::cerr << "Need an output filename." << std::endl; + std::cerr << "Need an output filename (-o)." << std::endl << std::endl; std::cerr << parser.usage() << std::endl; return 1; } @@ -695,6 +695,13 @@ struct ConvertCommand : public Command } } + if(infmt.empty()) + { + std::cerr << "Couldn't guess input format from filename." << std::endl << std::endl; + std::cerr << parser.usage() << std::endl; + return 1; + } + if(outfmt.empty()) { // try to guess the format by looking for the extension in the filename @@ -711,6 +718,13 @@ struct ConvertCommand : public Command } } + if(outfmt.empty()) + { + std::cerr << "Couldn't guess output format from filename." << std::endl << std::endl; + std::cerr << parser.usage() << std::endl; + return 1; + } + ICaptureFile *file = RENDERDOC_OpenCaptureFile(); ReplayStatus st = file->OpenFile(infile.c_str(), infmt.c_str());