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

Merge master into gtk3

Browse Source
This commit is contained in:
heckflosse
2016-10-28 17:59:47 +02:00
parent 5244c44420 3a346d919d
commit b16ef8d1f5
259 changed files with 5061 additions and 3654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rtgui/main.cc
View File

@@ -275,7 +275,7 @@ int main(int argc, char **argv)
#endif
if( !options.rtSettings.verbose ) {
TIFFSetWarningHandler(NULL); // avoid annoying message boxes
TIFFSetWarningHandler(nullptr); // avoid annoying message boxes
}
#ifndef WIN32
@@ -404,7 +404,7 @@ void deleteProcParams(std::vector<rtengine::procparams::PartialProfile*> &pparam
int processLineParams( int argc, char **argv )
{
rtengine::procparams::PartialProfile *rawParams = NULL, *imgParams = NULL;
rtengine::procparams::PartialProfile *rawParams = nullptr, *imgParams = nullptr;
std::vector<Glib::ustring> inputFiles;
Glib::ustring outputPath = "";
std::vector<rtengine::procparams::PartialProfile*> processingParams;
@@ -735,8 +735,8 @@ int processLineParams( int argc, char **argv )
Glib::ustring inputFile = inputFiles[iFile];
std::cout << "Processing: " << inputFile << std::endl;
rtengine::InitialImage* ii = NULL;
rtengine::ProcessingJob* job = NULL;
rtengine::InitialImage* ii = nullptr;
rtengine::ProcessingJob* job = nullptr;
int errorCode;
bool isRaw = false;
@@ -778,7 +778,7 @@ int processLineParams( int argc, char **argv )
isRaw = false;
}
ii = rtengine::InitialImage::load ( inputFile, isRaw, &errorCode, NULL );
ii = rtengine::InitialImage::load ( inputFile, isRaw, &errorCode, nullptr );
if (!ii) {
errors++;
@@ -839,7 +839,7 @@ int processLineParams( int argc, char **argv )
}
// Process image
rtengine::IImage16* resultImage = rtengine::processImage (job, errorCode, NULL, options.tunnelMetaData);
rtengine::IImage16* resultImage = rtengine::processImage (job, errorCode, nullptr, options.tunnelMetaData);
if( !resultImage ) {
errors++;