[Scummvm-cvs-logs] SF.net SVN: scummvm: [20798] scummvm/trunk/gui
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Feb 20 12:41:03 CET 2006
Revision: 20798
Author: fingolfin
Date: 2006-02-20 12:40:12 -0800 (Mon, 20 Feb 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=20798&view=rev
Log Message:
-----------
Fixing up my previous commit: finished moving common/scaler* to graphics
Modified Paths:
--------------
scummvm/trunk/engines/scumm/thumbnail.cpp
scummvm/trunk/graphics/scaler/2xsai.cpp
scummvm/trunk/graphics/scaler/aspect.cpp
scummvm/trunk/graphics/scaler/hq2x.cpp
scummvm/trunk/graphics/scaler/hq3x.cpp
scummvm/trunk/graphics/scaler/scale2x.cpp
scummvm/trunk/graphics/scaler/scale3x.cpp
scummvm/trunk/graphics/scaler/scalebit.cpp
scummvm/trunk/graphics/scaler/thumbnail.cpp
scummvm/trunk/gui/options.cpp
Modified: scummvm/trunk/engines/scumm/thumbnail.cpp
===================================================================
--- scummvm/trunk/engines/scumm/thumbnail.cpp 2006-02-20 20:29:02 UTC (rev 20797)
+++ scummvm/trunk/engines/scumm/thumbnail.cpp 2006-02-20 20:40:12 UTC (rev 20798)
@@ -24,7 +24,7 @@
#include "common/stdafx.h"
#include "common/system.h"
#include "common/savefile.h"
-#include "common/scaler.h"
+#include "graphics/scaler.h"
#include "scumm/scumm.h"
namespace Scumm {
Modified: scummvm/trunk/graphics/scaler/2xsai.cpp
===================================================================
--- scummvm/trunk/graphics/scaler/2xsai.cpp 2006-02-20 20:29:02 UTC (rev 20797)
+++ scummvm/trunk/graphics/scaler/2xsai.cpp 2006-02-20 20:40:12 UTC (rev 20798)
@@ -21,7 +21,7 @@
*
*/
-#include "common/scaler/intern.h"
+#include "graphics/scaler/intern.h"
Modified: scummvm/trunk/graphics/scaler/aspect.cpp
===================================================================
--- scummvm/trunk/graphics/scaler/aspect.cpp 2006-02-20 20:29:02 UTC (rev 20797)
+++ scummvm/trunk/graphics/scaler/aspect.cpp 2006-02-20 20:40:12 UTC (rev 20798)
@@ -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
Modified: scummvm/trunk/graphics/scaler/hq2x.cpp
===================================================================
--- scummvm/trunk/graphics/scaler/hq2x.cpp 2006-02-20 20:29:02 UTC (rev 20797)
+++ scummvm/trunk/graphics/scaler/hq2x.cpp 2006-02-20 20:40:12 UTC (rev 20798)
@@ -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 @@
#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 @@
#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
Modified: scummvm/trunk/graphics/scaler/hq3x.cpp
===================================================================
--- scummvm/trunk/graphics/scaler/hq3x.cpp 2006-02-20 20:29:02 UTC (rev 20797)
+++ scummvm/trunk/graphics/scaler/hq3x.cpp 2006-02-20 20:40:12 UTC (rev 20798)
@@ -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 @@
#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 @@
#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
Modified: scummvm/trunk/graphics/scaler/scale2x.cpp
===================================================================
--- scummvm/trunk/graphics/scaler/scale2x.cpp 2006-02-20 20:29:02 UTC (rev 20797)
+++ scummvm/trunk/graphics/scaler/scale2x.cpp 2006-02-20 20:40:12 UTC (rev 20798)
@@ -36,7 +36,7 @@
#include <config.h>
#endif
-#include "common/scaler/intern.h"
+#include "graphics/scaler/intern.h"
#include "scale2x.h"
Modified: scummvm/trunk/graphics/scaler/scale3x.cpp
===================================================================
--- scummvm/trunk/graphics/scaler/scale3x.cpp 2006-02-20 20:29:02 UTC (rev 20797)
+++ scummvm/trunk/graphics/scaler/scale3x.cpp 2006-02-20 20:40:12 UTC (rev 20798)
@@ -36,7 +36,7 @@
#include <config.h>
#endif
-#include "common/scaler/intern.h"
+#include "graphics/scaler/intern.h"
#include "scale3x.h"
Modified: scummvm/trunk/graphics/scaler/scalebit.cpp
===================================================================
--- scummvm/trunk/graphics/scaler/scalebit.cpp 2006-02-20 20:29:02 UTC (rev 20797)
+++ scummvm/trunk/graphics/scaler/scalebit.cpp 2006-02-20 20:40:12 UTC (rev 20798)
@@ -37,7 +37,7 @@
#include <config.h>
#endif
-#include "common/scaler/intern.h"
+#include "graphics/scaler/intern.h"
#include "scale2x.h"
#include "scale3x.h"
Modified: scummvm/trunk/graphics/scaler/thumbnail.cpp
===================================================================
--- scummvm/trunk/graphics/scaler/thumbnail.cpp 2006-02-20 20:29:02 UTC (rev 20797)
+++ scummvm/trunk/graphics/scaler/thumbnail.cpp 2006-02-20 20:40:12 UTC (rev 20798)
@@ -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 @@
}
}
-#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)
Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp 2006-02-20 20:29:02 UTC (rev 20797)
+++ scummvm/trunk/gui/options.cpp 2006-02-20 20:40:12 UTC (rev 20798)
@@ -29,7 +29,7 @@
#include "backends/fs/fs.h"
#include "common/config-manager.h"
-#include "common/scaler.h"
+#include "graphics/scaler.h"
#include "common/system.h"
#include "sound/mididrv.h"
#include "sound/mixer.h"
More information about the Scummvm-git-logs
mailing list