Remove Scaler config and use SWS_BICUBIC everywhere.

5 files changed, 7 insertions, 12 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 19f2861c4..d0b6faecb 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -787,12 +787,12 @@ private:
 		/* Enable i18n; this will create a Config object
 		   to look for a force-configured language.  This Config
 		   object will be wrong, however, because dcpomatic_setup
-		   hasn't yet been called and there aren't any scalers, filters etc.
+		   hasn't yet been called and there aren't any filters etc.
 		   set up yet.
 		*/
 		dcpomatic_setup_i18n ();
 
-		/* Set things up, including scalers / filters etc.
+		/* Set things up, including filters etc.
 		   which will now be internationalised correctly.
 		*/
 		dcpomatic_setup ();
diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index b92ca5d71..da8a61414 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -205,12 +205,12 @@ class App : public wxApp
 		/* Enable i18n; this will create a Config object
 		   to look for a force-configured language.  This Config
 		   object will be wrong, however, because dcpomatic_setup
-		   hasn't yet been called and there aren't any scalers, filters etc.
+		   hasn't yet been called and there aren't any filters etc.
 		   set up yet.
 		*/
 		dcpomatic_setup_i18n ();
 
-		/* Set things up, including scalers / filters etc.
+		/* Set things up, including filters etc.
 		   which will now be internationalised correctly.
 		*/
 		dcpomatic_setup ();
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index e187e573e..4facdd4d1 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -26,7 +26,6 @@
 #include "lib/transcode_job.h"
 #include "lib/job_manager.h"
 #include "lib/util.h"
-#include "lib/scaler.h"
 #include "lib/version.h"
 #include "lib/cross.h"
 #include "lib/config.h"
diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc
index 80f4a0d0c..847c1fa1b 100644
--- a/src/tools/dcpomatic_server_cli.cc
+++ b/src/tools/dcpomatic_server_cli.cc
@@ -36,7 +36,6 @@
 #include "lib/exceptions.h"
 #include "lib/util.h"
 #include "lib/config.h"
-#include "lib/scaler.h"
 #include "lib/image.h"
 #include "lib/log.h"
 #include "lib/version.h"
@@ -100,7 +99,6 @@ main (int argc, char* argv[])
 		}
 	}
 
-	Scaler::setup_scalers ();
 	shared_ptr<Log> log;
 	if (write_log) {
 		log.reset (new FileLog ("dcpomatic_server_cli.log"));
diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index 5cb1123b1..f27e25fde 100644
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,12 +25,10 @@
 #include "lib/film.h"
 #include "lib/filter.h"
 #include "lib/util.h"
-#include "lib/scaler.h"
 #include "lib/server.h"
 #include "lib/dcp_video.h"
 #include "lib/decoder.h"
 #include "lib/exceptions.h"
-#include "lib/scaler.h"
 #include "lib/log.h"
 #include "lib/video_decoder.h"
 #include "lib/player.h"