X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcolour_conversion_editor.cc;h=01b1ca056c1ed4739229f52c97fad917314bfd31;hp=19ebc90d5173b919af1948ba7b460c51f295d420;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hpb=e669b562937786bf5b771c927cc03a4074b01be8 diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc index 19ebc90d5..01b1ca056 100644 --- a/src/wx/colour_conversion_editor.cc +++ b/src/wx/colour_conversion_editor.cc @@ -27,13 +27,11 @@ #include #include #include -#include #include using std::string; using std::cout; using boost::shared_ptr; -using boost::make_shared; using boost::dynamic_pointer_cast; ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) @@ -310,15 +308,19 @@ ColourConversionEditor::get () const if (_input_gamma_linearised->GetValue ()) { conversion.set_in ( - make_shared ( - _input_power->GetValue (), - raw_convert (wx_to_std (_input_threshold->GetValue ())), - raw_convert (wx_to_std (_input_A->GetValue ())), - raw_convert (wx_to_std (_input_B->GetValue ())) + shared_ptr ( + new dcp::ModifiedGammaTransferFunction ( + _input_power->GetValue (), + raw_convert (wx_to_std (_input_threshold->GetValue ())), + raw_convert (wx_to_std (_input_A->GetValue ())), + raw_convert (wx_to_std (_input_B->GetValue ())) + ) ) ); } else { - conversion.set_in (make_shared (_input_gamma->GetValue ())); + conversion.set_in ( + shared_ptr (new dcp::GammaTransferFunction (_input_gamma->GetValue ())) + ); } conversion.set_yuv_to_rgb (static_cast (_yuv_to_rgb->GetSelection ())); @@ -347,7 +349,7 @@ ColourConversionEditor::get () const conversion.unset_adjusted_white (); } - conversion.set_out (make_shared (2.6)); + conversion.set_out (shared_ptr (new dcp::GammaTransferFunction (2.6))); return conversion; }