diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-10-14 21:12:45 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-10-14 21:13:14 +0200 |
| commit | 417a2ddd35b9b95373db2cff07e1d9256281105a (patch) | |
| tree | ee98b465f339e6fec0c64af81370bdec62369dd0 /src/wx | |
| parent | bb0e9d3993d3645b03775f1dc5b5ffec588b2c32 (diff) | |
Rename output gamma variables to specify J2K.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/colour_conversion_editor.cc | 15 | ||||
| -rw-r--r-- | src/wx/colour_conversion_editor.h | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc index d869b51d2..a16b7066f 100644 --- a/src/wx/colour_conversion_editor.cc +++ b/src/wx/colour_conversion_editor.cc @@ -212,8 +212,9 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) subhead (table, this, _("Output gamma correction"), r); - _output = new CheckBox (this, _("Inverse 2.6 gamma correction on output")); - table->Add (_output, wxGBPosition (r, 0), wxGBSpan (1, 2)); + _output_j2k = new CheckBox(this, _("Inverse 2.6 gamma correction on output to JPEG2000")); + table->Add(_output_j2k, wxGBPosition(r, 0), wxGBSpan(1, 2)); + ++r; _input_gamma->SetRange (0.1, 4.0); _input_gamma->SetDigits (2); @@ -240,7 +241,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) _adjusted_white_x->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::adjusted_white_changed, this)); _adjusted_white_y->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::adjusted_white_changed, this)); _yuv_to_rgb->Bind (wxEVT_CHOICE, bind (&ColourConversionEditor::changed, this)); - _output->bind(&ColourConversionEditor::changed, this); + _output_j2k->bind(&ColourConversionEditor::changed, this); } @@ -311,7 +312,7 @@ ColourConversionEditor::set (ColourConversion conversion) _adjust_white->SetValue (false); } - _output->SetValue (static_cast<bool>(dynamic_pointer_cast<const dcp::GammaTransferFunction>(conversion.out()))); + _output_j2k->SetValue(static_cast<bool>(dynamic_pointer_cast<const dcp::GammaTransferFunction>(conversion.out_j2k()))); update_rgb_to_xyz (); update_bradford (); @@ -373,10 +374,10 @@ ColourConversionEditor::get () const conversion.unset_adjusted_white (); } - if (_output->GetValue ()) { - conversion.set_out (make_shared<dcp::GammaTransferFunction>(2.6)); + if (_output_j2k->GetValue()) { + conversion.set_out_j2k(make_shared<dcp::GammaTransferFunction>(2.6)); } else { - conversion.set_out (make_shared<dcp::IdentityTransferFunction>()); + conversion.set_out_j2k(make_shared<dcp::IdentityTransferFunction>()); } return conversion; diff --git a/src/wx/colour_conversion_editor.h b/src/wx/colour_conversion_editor.h index de5ffb794..ac2273540 100644 --- a/src/wx/colour_conversion_editor.h +++ b/src/wx/colour_conversion_editor.h @@ -82,7 +82,7 @@ private: CheckBox* _adjust_white; wxTextCtrl* _adjusted_white_x; wxTextCtrl* _adjusted_white_y; - CheckBox* _output; + CheckBox* _output_j2k; wxStaticText* _rgb_to_xyz[3][3]; wxStaticText* _bradford[3][3]; }; |