Fixing up my previous commit: finished moving common/scaler* to graphics

svn-id: r20798

8 files changed, 18 insertions, 19 deletions

diff --git a/graphics/scaler/2xsai.cpp b/graphics/scaler/2xsai.cpp
index c8e360083f..539f90ab60 100644
--- a/graphics/scaler/2xsai.cpp
+++ b/graphics/scaler/2xsai.cpp
@@ -21,7 +21,7 @@
  *
  */
 
-#include "common/scaler/intern.h"
+#include "graphics/scaler/intern.h"
 
 
 
diff --git a/graphics/scaler/aspect.cpp b/graphics/scaler/aspect.cpp
index 6e55236850..45939b922d 100644
--- a/graphics/scaler/aspect.cpp
+++ b/graphics/scaler/aspect.cpp
@@ -21,8 +21,8 @@
  *
  */
 
-#include "common/scaler/intern.h"
-#include "common/scaler.h"
+#include "graphics/scaler/intern.h"
+#include "graphics/scaler.h"
 
 
 #define	kVeryFastAndUglyAspectMode	0	// No interpolation at all, but super-fast
diff --git a/graphics/scaler/hq2x.cpp b/graphics/scaler/hq2x.cpp
index cd15e7f97b..ba89b4f9cf 100644
--- a/graphics/scaler/hq2x.cpp
+++ b/graphics/scaler/hq2x.cpp
@@ -21,7 +21,7 @@
  *
  */
 
-#include "common/scaler/intern.h"
+#include "graphics/scaler/intern.h"
 
 #ifdef USE_NASM
 // Assembly version of HQ2x
@@ -128,13 +128,13 @@ static bool isAltiVecAvailable()  {
 
 #define bitFormat 565
 void HQ2x_565(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
-	#include "common/scaler/hq2x.h"
+	#include "graphics/scaler/hq2x.h"
 }
 #undef bitFormat
 
 #define bitFormat 555
 void HQ2x_555(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
-	#include "common/scaler/hq2x.h"
+	#include "graphics/scaler/hq2x.h"
 }
 #undef bitFormat
 
@@ -144,13 +144,13 @@ void HQ2x_555(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPit
 
 	#define bitFormat 565
 	void HQ2x_565_Altivec(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
-		#include "common/scaler/hq2x.h"
+		#include "graphics/scaler/hq2x.h"
 	}
 	#undef bitFormat
 
 	#define bitFormat 555
 	void HQ2x_555_Altivec(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
-		#include "common/scaler/hq2x.h"
+		#include "graphics/scaler/hq2x.h"
 	}
 	#undef bitFormat
 #endif
diff --git a/graphics/scaler/hq3x.cpp b/graphics/scaler/hq3x.cpp
index 497fe69be1..0c33c23ab2 100644
--- a/graphics/scaler/hq3x.cpp
+++ b/graphics/scaler/hq3x.cpp
@@ -21,7 +21,7 @@
  *
  */
 
-#include "common/scaler/intern.h"
+#include "graphics/scaler/intern.h"
 
 #ifdef USE_NASM
 // Assembly version of HQ3x
@@ -129,13 +129,13 @@ static bool isAltiVecAvailable()  {
 
 #define bitFormat 565
 void HQ3x_565(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
-	#include "common/scaler/hq3x.h"
+	#include "graphics/scaler/hq3x.h"
 }
 #undef bitFormat
 
 #define bitFormat 555
 void HQ3x_555(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
-	#include "common/scaler/hq3x.h"
+	#include "graphics/scaler/hq3x.h"
 }
 #undef bitFormat
 
@@ -145,13 +145,13 @@ void HQ3x_555(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPit
 
 	#define bitFormat 565
 	void HQ3x_565_Altivec(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
-		#include "common/scaler/hq3x.h"
+		#include "graphics/scaler/hq3x.h"
 	}
 	#undef bitFormat
 
 	#define bitFormat 555
 	void HQ3x_555_Altivec(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) {
-		#include "common/scaler/hq3x.h"
+		#include "graphics/scaler/hq3x.h"
 	}
 	#undef bitFormat
 #endif
diff --git a/graphics/scaler/scale2x.cpp b/graphics/scaler/scale2x.cpp
index 6d8a73f8cc..6e4bc7aa62 100644
--- a/graphics/scaler/scale2x.cpp
+++ b/graphics/scaler/scale2x.cpp
@@ -36,7 +36,7 @@
 #include <config.h>
 #endif
 
-#include "common/scaler/intern.h"
+#include "graphics/scaler/intern.h"
 
 #include "scale2x.h"
 
diff --git a/graphics/scaler/scale3x.cpp b/graphics/scaler/scale3x.cpp
index 22366d7cdb..e306540596 100644
--- a/graphics/scaler/scale3x.cpp
+++ b/graphics/scaler/scale3x.cpp
@@ -36,7 +36,7 @@
 #include <config.h>
 #endif
 
-#include "common/scaler/intern.h"
+#include "graphics/scaler/intern.h"
 
 #include "scale3x.h"
 
diff --git a/graphics/scaler/scalebit.cpp b/graphics/scaler/scalebit.cpp
index 71d9172534..9ff0c6da1e 100644
--- a/graphics/scaler/scalebit.cpp
+++ b/graphics/scaler/scalebit.cpp
@@ -37,7 +37,7 @@
 #include <config.h>
 #endif
 
-#include "common/scaler/intern.h"
+#include "graphics/scaler/intern.h"
 
 #include "scale2x.h"
 #include "scale3x.h"
diff --git a/graphics/scaler/thumbnail.cpp b/graphics/scaler/thumbnail.cpp
index 25e00363f1..38e31c40fc 100644
--- a/graphics/scaler/thumbnail.cpp
+++ b/graphics/scaler/thumbnail.cpp
@@ -25,7 +25,8 @@
 #include "common/scummsys.h"
 #include "common/system.h"
 
-#include "common/scaler/intern.h"
+#include "graphics/scaler.h"
+#include "graphics/scaler/intern.h"
 
 template<int bitFormat>
 uint16 quadBlockInterpolate(const uint8* src, uint32 srcPitch) {
@@ -69,8 +70,6 @@ void createThumbnail_4(const uint8* src, uint32 srcPitch, uint8* dstPtr, uint32
 	}
 }
 
-#include "common/scaler.h"
-
 void createThumbnail(const uint8* src, uint32 srcPitch, uint8* dstPtr, uint32 dstPitch, int width, int height) {
 	// only 1/2 and 1/4 downscale supported
 	if (width != 320 && width != 640)