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

Merging dev into hidpi-icons

Browse Source
This commit is contained in:
Hombre
2018-11-13 22:37:49 +01:00
parent 785a0e6a46 b0bc0c7add
commit 3d7ef4286e
131 changed files with 6426 additions and 2586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rtgui/main-cli.cc
View File

@@ -414,8 +414,6 @@ int processLineParams ( int argc, char **argv )
return -3;
}
std::cout << "Output is " << bits << "-bit " << (isFloat ? "floating-point" : "integer") << "." << std::endl;
break;
case 't':
@@ -626,6 +624,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() ) {
return 1;
}
@@ -666,6 +676,7 @@ int processLineParams ( int argc, char **argv )
rtengine::procparams::ProcParams currentParams;
Glib::ustring inputFile = inputFiles[iFile];
std::cout << "Output is " << bits << "-bit " << (isFloat ? "floating-point" : "integer") << "." << std::endl;
std::cout << "Processing: " << inputFile << std::endl;
rtengine::InitialImage* ii = nullptr;