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

Bit-depth detection from RT-cli now more bulletproof (see #2357)

Browse Source 
Thanks to Beep6581 for the fix
This commit is contained in:
Hombre
2018-09-01 23:04:49 +02:00
parent 5c10e19541
commit b26ea95c92
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtgui/main-cli.cc
View File

@@ -391,14 +391,15 @@ int processLineParams ( int argc, char **argv )
case 'b': case 'b':
bits = atoi (currParam.substr (2).c_str()); bits = atoi (currParam.substr (2).c_str());
if (currParam.length() >=3 && currParam.at(2) == '8') {
if (currParam.length() >= 3 && currParam.at(2) == '8') { // -b8
bits = 8; bits = 8;
} else if (currParam.length() >= 4 && currParam.at(2) == '1' && currParam.at(3) == '6') { } else if (currParam.length() >= 4 && currParam.length() <= 5 && currParam.at(2) == '1' && currParam.at(3) == '6') { // -b16, -b16f
bits = 16; bits = 16;
if (currParam.length() == 5 && currParam.at(4) == 'f') { if (currParam.length() == 5 && currParam.at(4) == 'f') {
isFloat = true; isFloat = true;
} }
} else if (currParam.length() == 4 && currParam.at(2) == '3' && currParam.at(3) == '2') { } else if (currParam.length() >= 4 && currParam.length() <= 5 && currParam.at(2) == '3' && currParam.at(3) == '2') { // -b32 == -b32f
bits = 32; bits = 32;
isFloat = true; isFloat = true;
} }
@@ -409,7 +410,7 @@ int processLineParams ( int argc, char **argv )
return -3; return -3;
} }
std::cout << "Output is " << bits << "-bit, " << (isFloat ? "floating point" : "integer") << std::endl; std::cout << "Output is " << bits << "-bit " << (isFloat ? "floating-point" : "integer") << "." << std::endl;
break; break;