Relax dependency from procparams.h
This commit is contained in:
@@ -19,6 +19,8 @@
|
||||
#ifndef _IMPROCCOORDINATOR_H_
|
||||
#define _IMPROCCOORDINATOR_H_
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "rtengine.h"
|
||||
#include "improcfun.h"
|
||||
#include "image8.h"
|
||||
@@ -70,8 +72,6 @@ protected:
|
||||
double lastAwbEqual;
|
||||
double lastAwbTempBias;
|
||||
|
||||
ImProcFunctions ipf;
|
||||
|
||||
Glib::ustring monitorProfile;
|
||||
RenderingIntent monitorIntent;
|
||||
bool softProof;
|
||||
@@ -185,7 +185,7 @@ protected:
|
||||
void updatePreviewImage (int todo, bool panningRelatedChange);
|
||||
|
||||
MyMutex mProcessing;
|
||||
ProcParams params;
|
||||
std::unique_ptr<ProcParams> params;
|
||||
|
||||
// for optimization purpose, the output profile, output rendering intent and
|
||||
// output BPC will trigger a regeneration of the profile on parameter change only
|
||||
@@ -200,7 +200,7 @@ protected:
|
||||
MyMutex paramsUpdateMutex;
|
||||
int changeSinceLast;
|
||||
bool updaterRunning;
|
||||
ProcParams nextParams;
|
||||
std::unique_ptr<ProcParams> nextParams;
|
||||
bool destroying;
|
||||
bool utili;
|
||||
bool autili;
|
||||
@@ -217,16 +217,16 @@ protected:
|
||||
bool highQualityComputed;
|
||||
cmsHTRANSFORM customTransformIn;
|
||||
cmsHTRANSFORM customTransformOut;
|
||||
|
||||
ImProcFunctions ipf;
|
||||
|
||||
public:
|
||||
|
||||
ImProcCoordinator ();
|
||||
~ImProcCoordinator () override;
|
||||
void assign (ImageSource* imgsrc);
|
||||
|
||||
void getParams (procparams::ProcParams* dst) override
|
||||
{
|
||||
*dst = params;
|
||||
}
|
||||
void getParams (procparams::ProcParams* dst) override;
|
||||
|
||||
void startProcessing (int changeCode) override;
|
||||
ProcParams* beginUpdateParams () override;
|
||||
|
Reference in New Issue
Block a user