From f9eb128b4620e17115472883a24efc50b7707f38 Mon Sep 17 00:00:00 2001 From: Dave French Date: Wed, 28 Jan 2015 13:39:35 +0000 Subject: [PATCH 1/3] Proposed fix for 1692 Missing CLI option for rendering --- src/core/main.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/core/main.cpp b/src/core/main.cpp index 2502058c2..dd129a096 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -191,6 +191,7 @@ int main( int argc, char * * argv ) "-x, --oversampling specify oversampling\n" " possible values: 1, 2, 4, 8\n" " default: 2\n" + "-32, --float 32bit float bit depth\n" "-u, --upgrade [out] upgrade file and save as \n" " standard out is used if no output file is specifed\n" "-d, --dump dump XML of compressed file \n" @@ -296,6 +297,12 @@ int main( int argc, char * * argv ) } ++i; } + else if ( argc > i && + ( QString( argv[i] ) =="--float") || + QString( argv[i] ) == "-32" ) + { + os.depth = ProjectRenderer::Depth_32Bit; + } else if( argc > i && ( QString( argv[i] ) == "--interpolation" || QString( argv[i] ) == "-i" ) ) From 406bc40ddd3c9a069d93671712ee82d350a0ad07 Mon Sep 17 00:00:00 2001 From: Dave French Date: Wed, 28 Jan 2015 17:06:19 +0000 Subject: [PATCH 2/3] fix 1692 reformat conditional statement to be consistant --- src/core/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/main.cpp b/src/core/main.cpp index dd129a096..6bdd1e3c9 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -298,8 +298,8 @@ int main( int argc, char * * argv ) ++i; } else if ( argc > i && - ( QString( argv[i] ) =="--float") || - QString( argv[i] ) == "-32" ) + ( QString( argv[i] ) =="--float" || + QString( argv[i] ) == "-32" ) ) { os.depth = ProjectRenderer::Depth_32Bit; } From 1ebbe31fae4bec778c56cfe5e4a1396d97b0d457 Mon Sep 17 00:00:00 2001 From: Dave French Date: Thu, 29 Jan 2015 11:36:21 +0000 Subject: [PATCH 3/3] Changed commandline flag to render in 32bit float from -32 to -a --- src/core/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/main.cpp b/src/core/main.cpp index 6bdd1e3c9..a489323fb 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -191,7 +191,7 @@ int main( int argc, char * * argv ) "-x, --oversampling specify oversampling\n" " possible values: 1, 2, 4, 8\n" " default: 2\n" - "-32, --float 32bit float bit depth\n" + "-a, --float 32bit float bit depth\n" "-u, --upgrade [out] upgrade file and save as \n" " standard out is used if no output file is specifed\n" "-d, --dump dump XML of compressed file \n" @@ -299,7 +299,7 @@ int main( int argc, char * * argv ) } else if ( argc > i && ( QString( argv[i] ) =="--float" || - QString( argv[i] ) == "-32" ) ) + QString( argv[i] ) == "-a" ) ) { os.depth = ProjectRenderer::Depth_32Bit; }