Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert...

[dcpomatic.git] / src / lib / scaler.cc

diff --git a/src/lib/scaler.cc b/src/lib/scaler.cc
index c81456a15034f0d382adab0d3eb311636e949e97..43c1ac81cb4213ec43895e7c0412ab0c802c16d9 100644 (file)
--- a/src/lib/scaler.cc
+++ b/src/lib/scaler.cc
@@ -21,12 +21,15 @@
  *  @brief A class to describe one of FFmpeg's software scalers.
  */
 
-#include <iostream>
-#include <cassert>
+#include "dcpomatic_assert.h"
+#include "scaler.h"
 extern "C" {
 #include <libswscale/swscale.h>
 }
-#include "scaler.h"
+#include <iostream>
+#include <cassert>
+
+#include "i18n.h"
 
 using namespace std;
 
@@ -57,15 +60,15 @@ Scaler::all ()
 void
 Scaler::setup_scalers ()
 {
-       _scalers.push_back (new Scaler (SWS_BICUBIC, "bicubic", "Bicubic"));
-       _scalers.push_back (new Scaler (SWS_X, "x", "X"));
-       _scalers.push_back (new Scaler (SWS_AREA, "area", "Area"));
-       _scalers.push_back (new Scaler (SWS_GAUSS, "gauss", "Gaussian"));
-       _scalers.push_back (new Scaler (SWS_LANCZOS, "lanczos", "Lanczos"));
-       _scalers.push_back (new Scaler (SWS_SINC, "sinc", "Sinc"));
-       _scalers.push_back (new Scaler (SWS_SPLINE, "spline", "Spline"));
-       _scalers.push_back (new Scaler (SWS_BILINEAR, "bilinear", "Bilinear"));
-       _scalers.push_back (new Scaler (SWS_FAST_BILINEAR, "fastbilinear", "Fast Bilinear"));
+       _scalers.push_back (new Scaler (SWS_BICUBIC, N_("bicubic"), _("Bicubic")));
+       _scalers.push_back (new Scaler (SWS_X, N_("x"), _("X")));
+       _scalers.push_back (new Scaler (SWS_AREA, N_("area"), _("Area")));
+       _scalers.push_back (new Scaler (SWS_GAUSS, N_("gauss"), _("Gaussian")));
+       _scalers.push_back (new Scaler (SWS_LANCZOS, N_("lanczos"), _("Lanczos")));
+       _scalers.push_back (new Scaler (SWS_SINC, N_("sinc"), _("Sinc")));
+       _scalers.push_back (new Scaler (SWS_SPLINE, N_("spline"), _("Spline")));
+       _scalers.push_back (new Scaler (SWS_BILINEAR, N_("bilinear"), _("Bilinear")));
+       _scalers.push_back (new Scaler (SWS_FAST_BILINEAR, N_("fastbilinear"), _("Fast Bilinear")));
 }
 
 /** @param id One of our ids.
@@ -110,6 +113,6 @@ Scaler::as_index (Scaler const * s)
 Scaler const *
 Scaler::from_index (int i)
 {
-       assert (i <= int(_scalers.size ()));
+       DCPOMATIC_ASSERT (i <= int(_scalers.size ()));
        return _scalers[i];
 }