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

Restore cleanups to rtengine/dcp.*

Browse Source
This commit is contained in:
Lawrence Lee
2022-12-03 22:21:30 -08:00
parent 4223f114cb
commit ec84e17224
11 changed files with 98 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
rtengine/dcp.h
View File

@@ -36,24 +36,11 @@ namespace rtengine
class ColorTemp;
class Imagefloat;
class DCPProfileApplyState;
class DCPProfile final
{
public:
class ApplyState final
{
public:
ApplyState();
~ApplyState();
private:
struct Data;
std::unique_ptr<Data> data;
friend class DCPProfile;
};
struct Illuminants {
short light_source_1;
short light_source_2;
@@ -85,10 +72,10 @@ public:
const ColorTemp& white_balance,
const Triple& pre_mul,
const Matrix& cam_wb_matrix,
bool apply_hue_sat_map
bool apply_hue_sat_map = true
) const;
void setStep2ApplyState(const Glib::ustring& working_space, bool use_tone_curve, bool apply_look_table, bool apply_baseline_exposure, ApplyState& as_out);
void step2ApplyTile(float* r, float* g, float* b, int width, int height, int tile_width, const ApplyState& as_in) const;
void setStep2ApplyState(const Glib::ustring& working_space, bool use_tone_curve, bool apply_look_table, bool apply_baseline_exposure, DCPProfileApplyState& as_out);
void step2ApplyTile(float* r, float* g, float* b, int width, int height, int tile_width, const DCPProfileApplyState& as_in) const;
private:
struct HsbModify {
@@ -149,6 +136,20 @@ private:
AdobeToneCurve tone_curve;
};
class DCPProfileApplyState final
{
public:
DCPProfileApplyState();
~DCPProfileApplyState();
private:
struct Data;
const std::unique_ptr<Data> data;
friend class DCPProfile;
};
class DCPStore final :
public NonCopyable
{