4 files changed, 66 insertions, 16 deletions
diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp
index a6ae544ff5..876be270ec 100644
--- a/graphics/scaler.cpp
+++ b/graphics/scaler.cpp
@@ -184,9 +184,8 @@ extern "C" void Normal2xAspectMask(const uint8  *srcPtr,
 
 /**
  * A 2x scaler which also does aspect ratio correction.
- * Presumably this is Normal2x combined with vertical
- * stretching, so it will scale a 320x200 surface to
- * a 640x480 surface.
+ * This is Normal2x combined with vertical stretching,
+ * so it will scale a 320x200 surface to a 640x480 surface.
  */
 void Normal2xAspect(const uint8  *srcPtr,
                           uint32  srcPitch,
diff --git a/graphics/scaler.h b/graphics/scaler.h
index bdae161bd1..9d2e578bde 100644
--- a/graphics/scaler.h
+++ b/graphics/scaler.h
@@ -58,18 +58,6 @@ DECLARE_SCALER(HQ2x);
 DECLARE_SCALER(HQ3x);
 #endif
 
-FORCEINLINE int real2Aspect(int y) {
-	return y + (y + 1) / 5;
-}
-
-FORCEINLINE int aspect2Real(int y) {
-	return (y * 5 + 4) / 6;
-}
-
-extern void makeRectStretchable(int &x, int &y, int &w, int &h);
-
-extern int stretch200To240(uint8 *buf, uint32 pitch, int width, int height, int srcX, int srcY, int origSrcY);
-
 // creates a 160x100 thumbnail for 320x200 games
 // and 160x120 thumbnail for 320x240 and 640x480 games
 // only 565 mode
diff --git a/graphics/scaler/aspect.cpp b/graphics/scaler/aspect.cpp
index 4b3f194244..5f8f5f8279 100644
--- a/graphics/scaler/aspect.cpp
+++ b/graphics/scaler/aspect.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "graphics/scaler/intern.h"
-#include "graphics/scaler.h"
+#include "graphics/scaler/aspect.h"
 
 
 #define	kVeryFastAndUglyAspectMode	0	// No interpolation at all, but super-fast
diff --git a/graphics/scaler/aspect.h b/graphics/scaler/aspect.h
new file mode 100644
index 0000000000..ebe922ef00
--- /dev/null
+++ b/graphics/scaler/aspect.h
@@ -0,0 +1,63 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ */
+
+#ifndef GRAPHICS_SCALER_ASPECT_H
+#define GRAPHICS_SCALER_ASPECT_H
+
+#include "common/scummsys.h"
+
+/**
+ * TODO: explain
+ */
+FORCEINLINE int real2Aspect(int y) {
+	return y + (y + 1) / 5;
+}
+
+/**
+ * TODO: explain
+ */
+FORCEINLINE int aspect2Real(int y) {
+	return (y * 5 + 4) / 6;
+}
+
+/**
+ * TODO: explain
+ */
+void makeRectStretchable(int &x, int &y, int &w, int &h);
+
+/**
+ * TODO: explain
+ */
+int stretch200To240(uint8 *buf,
+                    uint32 pitch,
+                    int width,
+                    int height,
+                    int srcX,
+                    int srcY,
+                    int origSrcY);
+
+// TODO: Move Normal2xAspect & PocketPCLandscapeAspect here;
+// also rename the latter to Normal1xAspect
+
+#endif