Merge branch 'dev' into newlocallab

This commit is contained in:
heckflosse
2019-03-12 14:57:17 +01:00
150 changed files with 1822 additions and 1298 deletions

View File

@@ -36,6 +36,7 @@
#include "rtlensfun.h"
#include "pdaflinesfilter.h"
#include "camconst.h"
#include "procparams.h"
#ifdef _OPENMP
#include <omp.h>
#endif
@@ -452,6 +453,7 @@ RawImageSource::RawImageSource()
, red(0, 0)
, blue(0, 0)
, rawDirty(true)
, histMatchingParams(new procparams::ColorManagementParams)
{
camProfile = nullptr;
embProfile = nullptr;