diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-21 01:14:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-21 01:14:06 +0100 |
| commit | 5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f (patch) | |
| tree | 769dca1358e35017ce5a5b3ab2dfafe2b24d61ed /src/wx/colour_conversion_editor.cc | |
| parent | 4e83acad0c2a5c528709a175a80261b8147d3b49 (diff) | |
Use make_shared<>.
Diffstat (limited to 'src/wx/colour_conversion_editor.cc')
| -rw-r--r-- | src/wx/colour_conversion_editor.cc | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc index 01b1ca056..19ebc90d5 100644 --- a/src/wx/colour_conversion_editor.cc +++ b/src/wx/colour_conversion_editor.cc @@ -27,11 +27,13 @@ #include <dcp/modified_gamma_transfer_function.h> #include <wx/spinctrl.h> #include <wx/gbsizer.h> +#include <boost/make_shared.hpp> #include <iostream> 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) @@ -308,19 +310,15 @@ ColourConversionEditor::get () const if (_input_gamma_linearised->GetValue ()) { conversion.set_in ( - shared_ptr<dcp::ModifiedGammaTransferFunction> ( - new dcp::ModifiedGammaTransferFunction ( - _input_power->GetValue (), - raw_convert<double> (wx_to_std (_input_threshold->GetValue ())), - raw_convert<double> (wx_to_std (_input_A->GetValue ())), - raw_convert<double> (wx_to_std (_input_B->GetValue ())) - ) + make_shared<dcp::ModifiedGammaTransferFunction> ( + _input_power->GetValue (), + raw_convert<double> (wx_to_std (_input_threshold->GetValue ())), + raw_convert<double> (wx_to_std (_input_A->GetValue ())), + raw_convert<double> (wx_to_std (_input_B->GetValue ())) ) ); } else { - conversion.set_in ( - shared_ptr<dcp::GammaTransferFunction> (new dcp::GammaTransferFunction (_input_gamma->GetValue ())) - ); + conversion.set_in (make_shared<dcp::GammaTransferFunction> (_input_gamma->GetValue ())); } conversion.set_yuv_to_rgb (static_cast<dcp::YUVToRGB> (_yuv_to_rgb->GetSelection ())); @@ -349,7 +347,7 @@ ColourConversionEditor::get () const conversion.unset_adjusted_white (); } - conversion.set_out (shared_ptr<dcp::GammaTransferFunction> (new dcp::GammaTransferFunction (2.6))); + conversion.set_out (make_shared<dcp::GammaTransferFunction> (2.6)); return conversion; } |