From 07f20e3d27ca6754f5ea55ebf2f98715e4e97d63 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 31 May 2025 14:09:43 +0200 Subject: White space: ratio.{cc,h} --- src/lib/ratio.cc | 52 ++++++++++++++++++++++++++-------------------------- src/lib/ratio.h | 36 ++++++++++++++++++------------------ 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/lib/ratio.cc b/src/lib/ratio.cc index 5f1a3aa63..82cd1c129 100644 --- a/src/lib/ratio.cc +++ b/src/lib/ratio.cc @@ -37,44 +37,44 @@ vector Ratio::_ratios; void -Ratio::setup_ratios () +Ratio::setup_ratios() { /* This must only be called once as we rely on the addresses of objects in _ratios staying the same */ - DCPOMATIC_ASSERT (_ratios.empty()); - - _ratios.push_back (Ratio(float(1290) / 1080, "119", _("1.19"), {}, "119")); - _ratios.push_back (Ratio(float(1440) / 1080, "133", _("1.33 (4:3)"), {}, "133")); - _ratios.push_back (Ratio(float(1485) / 1080, "138", _("1.38 (Academy)"), {}, "137")); - _ratios.push_back (Ratio(float(1544) / 1080, "143", _("1.43 (IMAX)"), {}, "143")); - _ratios.push_back (Ratio(float(1800) / 1080, "166", _("1.66"), {}, "166")); - _ratios.push_back (Ratio(float(1920) / 1080, "178", _("1.78 (16:9 or HD)"), {}, "178")); - _ratios.push_back (Ratio(float(1998) / 1080, "185", _("1.85 (Flat)"), string(_("DCI Flat")), "F")); - _ratios.push_back (Ratio(float(2048) / 872, "235", _("2.35 (35mm Scope)"), {}, "S")); - _ratios.push_back (Ratio(float(2048) / 858, "239", _("2.39 (Scope)"), string(_("DCI Scope")), "S")); - _ratios.push_back (Ratio(float(2048) / 1080, "190", _("1.90 (Full frame)"), string(_("Full frame")), "C")); + DCPOMATIC_ASSERT(_ratios.empty()); + + _ratios.push_back(Ratio(float(1290) / 1080, "119", _("1.19"), {}, "119")); + _ratios.push_back(Ratio(float(1440) / 1080, "133", _("1.33 (4:3)"), {}, "133")); + _ratios.push_back(Ratio(float(1485) / 1080, "138", _("1.38 (Academy)"), {}, "137")); + _ratios.push_back(Ratio(float(1544) / 1080, "143", _("1.43 (IMAX)"), {}, "143")); + _ratios.push_back(Ratio(float(1800) / 1080, "166", _("1.66"), {}, "166")); + _ratios.push_back(Ratio(float(1920) / 1080, "178", _("1.78 (16:9 or HD)"), {}, "178")); + _ratios.push_back(Ratio(float(1998) / 1080, "185", _("1.85 (Flat)"), string(_("DCI Flat")), "F")); + _ratios.push_back(Ratio(float(2048) / 872, "235", _("2.35 (35mm Scope)"), {}, "S")); + _ratios.push_back(Ratio(float(2048) / 858, "239", _("2.39 (Scope)"), string(_("DCI Scope")), "S")); + _ratios.push_back(Ratio(float(2048) / 1080, "190", _("1.90 (Full frame)"), string(_("Full frame")), "C")); } vector -Ratio::all () +Ratio::all() { vector pointers; for (Ratio& ratio: _ratios) { - pointers.push_back (&ratio); + pointers.push_back(&ratio); } return pointers; } Ratio const * -Ratio::from_id (string i) +Ratio::from_id(string i) { /* We removed the ratio with id 137; replace it with 138 */ if (i == "137") { i = "138"; } - auto j = _ratios.begin (); + auto j = _ratios.begin(); while (j != _ratios.end() && j->id() != i) { ++j; } @@ -89,14 +89,14 @@ Ratio::from_id (string i) /** @return Ratio corresponding to a given fractional ratio (+/- 0.01), or 0 */ Ratio const * -Ratio::from_ratio (float r) +Ratio::from_ratio(float r) { - auto j = _ratios.begin (); + auto j = _ratios.begin(); while (j != _ratios.end() && fabs(j->ratio() - r) > 0.01) { ++j; } - if (j == _ratios.end ()) { + if (j == _ratios.end()) { return nullptr; } @@ -105,7 +105,7 @@ Ratio::from_ratio (float r) Ratio const * -Ratio::nearest_from_ratio (float r) +Ratio::nearest_from_ratio(float r) { vector::const_iterator nearest = _ratios.end(); float distance = FLT_MAX; @@ -118,27 +118,27 @@ Ratio::nearest_from_ratio (float r) } } - DCPOMATIC_ASSERT (nearest != _ratios.end()); + DCPOMATIC_ASSERT(nearest != _ratios.end()); return &(*nearest); } vector -Ratio::containers () +Ratio::containers() { if (Config::instance()->allow_any_container()) { return all(); } vector r; - r.push_back (Ratio::from_id ("185")); - r.push_back (Ratio::from_id ("239")); + r.push_back(Ratio::from_id("185")); + r.push_back(Ratio::from_id("239")); return r; } string -Ratio::container_nickname () const +Ratio::container_nickname() const { if (!_container_nickname) { /* Fall back to the image nickname; this just for when non-standard container diff --git a/src/lib/ratio.h b/src/lib/ratio.h index 31ff09358..d4580827b 100644 --- a/src/lib/ratio.h +++ b/src/lib/ratio.h @@ -34,44 +34,44 @@ class Ratio { public: - Ratio (float ratio, std::string id, std::string in, boost::optional cn, std::string d) - : _ratio (ratio) - , _id (id) - , _image_nickname (in) - , _container_nickname (cn) - , _isdcf_name (d) + Ratio(float ratio, std::string id, std::string in, boost::optional cn, std::string d) + : _ratio(ratio) + , _id(id) + , _image_nickname(in) + , _container_nickname(cn) + , _isdcf_name(d) {} - std::string id () const { + std::string id() const { return _id; } - std::string image_nickname () const { + std::string image_nickname() const { return _image_nickname; } - std::string container_nickname () const; + std::string container_nickname() const; - bool used_for_container () const { + bool used_for_container() const { return static_cast(_container_nickname); } - std::string isdcf_name () const { + std::string isdcf_name() const { return _isdcf_name; } - float ratio () const { + float ratio() const { return _ratio; } - static void setup_ratios (); - static Ratio const * from_id (std::string i); - static Ratio const * from_ratio (float r); - static Ratio const * nearest_from_ratio (float r); + static void setup_ratios(); + static Ratio const * from_id(std::string i); + static Ratio const * from_ratio(float r); + static Ratio const * nearest_from_ratio(float r); - static std::vector all (); + static std::vector all(); - static std::vector containers (); + static std::vector containers(); private: float _ratio; -- cgit v1.2.3