diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2023-02-27 16:05:52 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2023-02-27 16:07:22 +0100 |
| commit | e1f05c90dbd440c2f670b9d8dd4849cafdb3f91b (patch) | |
| tree | 9536059da0ac869edf5ad3bda5684ae5b44f43c7 | |
| parent | 04ae0a46fdc50a2ec96d5f6e2284c4ddd6c92a65 (diff) | |
video/opencv, tracker/nn: maybe fix gcc build
| -rw-r--r-- | tracker-neuralnet/ftnoir_tracker_neuralnet.cpp | 2 | ||||
| -rw-r--r-- | video-opencv/impl-camera.cpp | 4 | ||||
| -rw-r--r-- | video-opencv/settings.hpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp b/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp index 5f582340..f23356d5 100644 --- a/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp +++ b/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp @@ -780,7 +780,7 @@ NeuralNetDialog::NeuralNetDialog() : for (const auto& [label, preset] : presets) ui_.exposure_preset->addItem(label, int(preset)); - tie_setting(cs_.exposure_preset, ui_.exposure_preset); + tie_setting(cs_.exposure, ui_.exposure_preset); } connect(ui_.buttonBox, SIGNAL(accepted()), this, SLOT(doOK())); diff --git a/video-opencv/impl-camera.cpp b/video-opencv/impl-camera.cpp index b11c5cd5..afd76310 100644 --- a/video-opencv/impl-camera.cpp +++ b/video-opencv/impl-camera.cpp @@ -33,7 +33,7 @@ bool cam::is_open() void cam::set_exposure(bool write) { - auto e = *s.exposure_preset; + auto e = *s.exposure; if (e != exposure) switch (e) { @@ -42,7 +42,7 @@ void cam::set_exposure(bool write) default: break; } - if (s.exposure_preset != exposure_preset::ignored) + if (s.exposure != exposure_preset::ignored) { constexpr struct { int prop, value; diff --git a/video-opencv/settings.hpp b/video-opencv/settings.hpp index 69fb5705..a4f70c25 100644 --- a/video-opencv/settings.hpp +++ b/video-opencv/settings.hpp @@ -9,5 +9,5 @@ enum class exposure_preset : int { struct dshow_camera_settings final { bundle b = make_bundle("video-camera"); - value<exposure_preset> exposure_preset{b, "exposure-preset", exposure_preset::near}; + value<exposure_preset> exposure{b, "exposure-preset", exposure_preset::near}; }; |