Moved common/scaler* to graphics/

svn-id: r20797

24 files changed, 38 insertions, 40 deletions

diff --git a/TODO b/TODO
index 6f8a7464a8..b4f882caa0 100644
--- a/TODO
+++ b/TODO
@@ -112,9 +112,6 @@ General
   reachable :-)
 * Some source files should be moved. But that's a pain with CVS, so let's
   wait until we switch to something better, like Subversion. In particular:
-  - common/scaler* stuff should either be moved to graphics/, or maybe
-    to backends/ (while it is portable code, it's something to be used by
-    the backends only)
   - consider moving the MIDI stuff from sound/ to sound/midi/ 
   - move fmopl code to softsynth dir
   - move fonts to graphics/fonts/ dir
diff --git a/backends/sdl/graphics.cpp b/backends/sdl/graphics.cpp
index a711a46cc7..cdbb23472e 100644
--- a/backends/sdl/graphics.cpp
+++ b/backends/sdl/graphics.cpp
@@ -22,10 +22,10 @@
  */
 
 #include "backends/sdl/sdl-common.h"
-#include "common/scaler.h"
 #include "common/util.h"
 #include "graphics/font.h"
 #include "graphics/fontman.h"
+#include "graphics/scaler.h"
 #include "graphics/surface.h"
 
 static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
diff --git a/backends/sdl/sdl-common.h b/backends/sdl/sdl-common.h
index 78953ff918..c7d19281a7 100644
--- a/backends/sdl/sdl-common.h
+++ b/backends/sdl/sdl-common.h
@@ -26,8 +26,8 @@
 
 #include "common/stdafx.h"
 #include "common/scummsys.h"
-#include "common/scaler.h"
 #include "common/system.h"
+#include "graphics/scaler.h"
 #include "backends/intern.h"
 
 #include <SDL.h>
diff --git a/common/module.mk b/common/module.mk
index 116dff18ed..cf1348ba2b 100644
--- a/common/module.mk
+++ b/common/module.mk
@@ -12,36 +12,10 @@ MODULE_OBJS := \
 	util.o \
 	savefile.o \
 	system.o \
-	scaler.o \
-	scaler/thumbnail.o \
 	unzip.o
 
-ifndef DISABLE_SCALERS
-MODULE_OBJS += \
-	scaler/2xsai.o \
-	scaler/aspect.o \
-	scaler/scale2x.o \
-	scaler/scale3x.o \
-	scaler/scalebit.o
-
-ifndef DISABLE_HQ_SCALERS
-MODULE_OBJS += \
-	scaler/hq2x.o \
-	scaler/hq3x.o
-
-ifdef HAVE_NASM
-MODULE_OBJS += \
-	scaler/hq2x_i386.o \
-	scaler/hq3x_i386.o
-endif
-
-endif
-
-endif
-
 MODULE_DIRS += \
-	common \
-	common/scaler
+	common
 
 # Include common rules 
 include $(srcdir)/common.rules
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 0db2a9bc7d..e4641ae0be 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -24,7 +24,8 @@
 #include "common/config-manager.h"
 #include "common/savefile.h"
 #include "common/system.h"
-#include "common/scaler.h"
+
+#include "graphics/scaler.h"
 
 #include "gui/about.h"
 #include "gui/chooser.h"
diff --git a/graphics/module.mk b/graphics/module.mk
index 8c5697d5a1..7ded354cdb 100644
--- a/graphics/module.mk
+++ b/graphics/module.mk
@@ -6,16 +6,42 @@ MODULE_OBJS := \
 	font.o \
 	fontman.o \
 	ilbm.o \
-	newfont.o \
+	imagedec.o \
+	imageman.o \
 	newfont_big.o \
+	newfont.o \
 	primitives.o \
+	scaler.o \
+	scaler/thumbnail.o \
 	scummfont.o \
-	surface.o \
-	imageman.o \
-	imagedec.o
+	surface.o
+
+ifndef DISABLE_SCALERS
+MODULE_OBJS += \
+	scaler/2xsai.o \
+	scaler/aspect.o \
+	scaler/scale2x.o \
+	scaler/scale3x.o \
+	scaler/scalebit.o
+
+ifndef DISABLE_HQ_SCALERS
+MODULE_OBJS += \
+	scaler/hq2x.o \
+	scaler/hq3x.o
+
+ifdef HAVE_NASM
+MODULE_OBJS += \
+	scaler/hq2x_i386.o \
+	scaler/hq3x_i386.o
+endif
+
+endif
+
+endif
 
 MODULE_DIRS += \
-	graphics
+	graphics \
+	graphics/scaler
 
 # Include common rules 
 include $(srcdir)/common.rules
diff --git a/common/scaler.cpp b/graphics/scaler.cpp
index 7621a14273..5364e39a2f 100644
--- a/common/scaler.cpp
+++ b/graphics/scaler.cpp
@@ -21,8 +21,8 @@
  *
  */
 
-#include "common/scaler/intern.h"
-#include "common/scaler/scalebit.h"
+#include "graphics/scaler/intern.h"
+#include "graphics/scaler/scalebit.h"
 #include "common/util.h"
 
 
diff --git a/common/scaler.h b/graphics/scaler.h
index 9f743216ac..9f743216ac 100644
--- a/common/scaler.h
+++ b/graphics/scaler.h
diff --git a/common/scaler/2xsai.cpp b/graphics/scaler/2xsai.cpp
index c8e360083f..c8e360083f 100644
--- a/common/scaler/2xsai.cpp
+++ b/graphics/scaler/2xsai.cpp
diff --git a/common/scaler/aspect.cpp b/graphics/scaler/aspect.cpp
index 6e55236850..6e55236850 100644
--- a/common/scaler/aspect.cpp
+++ b/graphics/scaler/aspect.cpp
diff --git a/common/scaler/hq2x.cpp b/graphics/scaler/hq2x.cpp
index cd15e7f97b..cd15e7f97b 100644
--- a/common/scaler/hq2x.cpp
+++ b/graphics/scaler/hq2x.cpp
diff --git a/common/scaler/hq2x.h b/graphics/scaler/hq2x.h
index a59f108048..a59f108048 100644
--- a/common/scaler/hq2x.h
+++ b/graphics/scaler/hq2x.h
diff --git a/common/scaler/hq2x_i386.asm b/graphics/scaler/hq2x_i386.asm
index ef49b590f5..ef49b590f5 100644
--- a/common/scaler/hq2x_i386.asm
+++ b/graphics/scaler/hq2x_i386.asm
diff --git a/common/scaler/hq3x.cpp b/graphics/scaler/hq3x.cpp
index 497fe69be1..497fe69be1 100644
--- a/common/scaler/hq3x.cpp
+++ b/graphics/scaler/hq3x.cpp
diff --git a/common/scaler/hq3x.h b/graphics/scaler/hq3x.h
index 7fda8d5105..7fda8d5105 100644
--- a/common/scaler/hq3x.h
+++ b/graphics/scaler/hq3x.h
diff --git a/common/scaler/hq3x_i386.asm b/graphics/scaler/hq3x_i386.asm
index 100482f122..100482f122 100644
--- a/common/scaler/hq3x_i386.asm
+++ b/graphics/scaler/hq3x_i386.asm
diff --git a/common/scaler/intern.h b/graphics/scaler/intern.h
index fa3ca1823a..fa3ca1823a 100644
--- a/common/scaler/intern.h
+++ b/graphics/scaler/intern.h
diff --git a/common/scaler/scale2x.cpp b/graphics/scaler/scale2x.cpp
index 6d8a73f8cc..6d8a73f8cc 100644
--- a/common/scaler/scale2x.cpp
+++ b/graphics/scaler/scale2x.cpp
diff --git a/common/scaler/scale2x.h b/graphics/scaler/scale2x.h
index 2101790905..2101790905 100644
--- a/common/scaler/scale2x.h
+++ b/graphics/scaler/scale2x.h
diff --git a/common/scaler/scale3x.cpp b/graphics/scaler/scale3x.cpp
index 22366d7cdb..22366d7cdb 100644
--- a/common/scaler/scale3x.cpp
+++ b/graphics/scaler/scale3x.cpp
diff --git a/common/scaler/scale3x.h b/graphics/scaler/scale3x.h
index 3f24d884e1..3f24d884e1 100644
--- a/common/scaler/scale3x.h
+++ b/graphics/scaler/scale3x.h
diff --git a/common/scaler/scalebit.cpp b/graphics/scaler/scalebit.cpp
index 71d9172534..71d9172534 100644
--- a/common/scaler/scalebit.cpp
+++ b/graphics/scaler/scalebit.cpp
diff --git a/common/scaler/scalebit.h b/graphics/scaler/scalebit.h
index dd46883f97..dd46883f97 100644
--- a/common/scaler/scalebit.h
+++ b/graphics/scaler/scalebit.h
diff --git a/common/scaler/thumbnail.cpp b/graphics/scaler/thumbnail.cpp
index 25e00363f1..25e00363f1 100644
--- a/common/scaler/thumbnail.cpp
+++ b/graphics/scaler/thumbnail.cpp