liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes unspecified bit depth in CLI

Browse Source 
In rawtherapee-cli, if you did not explcitly specify a bit depth then -1
was used and lead to corrupted saved images.
Fixes #4937
This commit is contained in:
Morgan Hardwood
2018-11-04 19:06:54 +01:00
parent eef2c5f959
commit 4fefc9433a
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rtgui/main-cli.cc
View File

@@ -410,8 +410,6 @@ int processLineParams ( int argc, char **argv )
return -3; return -3;
} }
std::cout << "Output is " << bits << "-bit " << (isFloat ? "floating-point" : "integer") << "." << std::endl;
break; break;
case 't': case 't':
@@ -622,6 +620,18 @@ int processLineParams ( int argc, char **argv )
} }
} }
if (bits == -1) {
if (outputType == "jpg") {
bits = 8;
} else if (outputType == "png") {
bits = 8;
} else if (outputType == "tif") {
bits = 16;
} else {
bits = 8;
}
}
if ( !argv1.empty() ) { if ( !argv1.empty() ) {
return 1; return 1;
} }
@@ -662,6 +672,7 @@ int processLineParams ( int argc, char **argv )
rtengine::procparams::ProcParams currentParams; rtengine::procparams::ProcParams currentParams;
Glib::ustring inputFile = inputFiles[iFile]; Glib::ustring inputFile = inputFiles[iFile];
std::cout << "Output is " << bits << "-bit " << (isFloat ? "floating-point" : "integer") << "." << std::endl;
std::cout << "Processing: " << inputFile << std::endl; std::cout << "Processing: " << inputFile << std::endl;
rtengine::InitialImage* ii = nullptr; rtengine::InitialImage* ii = nullptr;