Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert()s with thrown exceptions.

1 files changed, 5 insertions, 4 deletions

diff --git a/src/lib/scaler.cc b/src/lib/scaler.cc
index 40a0f05b9..43c1ac81c 100644
--- a/src/lib/scaler.cc
+++ b/src/lib/scaler.cc
@@ -21,12 +21,13 @@
  *  @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"
 
@@ -112,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];
 }