[Scummvm-cvs-logs] CVS: scummvm/common module.mk,1.8,1.9 scaler.cpp,1.46,1.47
Max Horn
fingolfin at users.sourceforge.net
Mon Sep 29 09:03:06 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/common/scaler - New directory
- Next message: [Scummvm-cvs-logs] CVS: scummvm/common/scaler .cvsignore,NONE,1.1 2xsai.cpp,NONE,1.1 aspect.cpp,NONE,1.1 hq2x.cpp,NONE,1.1 hq3x.cpp,NONE,1.1 intern.h,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv5047
Modified Files:
module.mk scaler.cpp
Log Message:
split out scalers into separate source files in common/scaler; some optimizations (in particular, the hq2x/hq3x scalers now are compiled into two versions, one for 555 and one for 565 mode)
Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/module.mk,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- module.mk 18 Sep 2003 02:07:17 -0000 1.8
+++ module.mk 29 Sep 2003 16:02:46 -0000 1.9
@@ -7,7 +7,11 @@
common/str.o \
common/timer.o \
common/util.o \
- common/savefile.o
+ common/savefile.o \
+ common/scaler/2xsai.o \
+ common/scaler/aspect.o \
+ common/scaler/hq2x.o \
+ common/scaler/hq3x.o
MODULE_DIRS += \
common
Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- scaler.cpp 27 Sep 2003 23:59:09 -0000 1.46
+++ scaler.cpp 29 Sep 2003 16:02:46 -0000 1.47
@@ -20,10 +20,7 @@
*
*/
-#include "stdafx.h"
-#include "common/scummsys.h"
-#include "common/scaler.h"
-#include "common/util.h"
+#include "common/scaler/intern.h"
// TODO: get rid of the colorMask etc. variables and instead use templates.
[...5608 lines suppressed...]
- break;
- case 1:
- interpolate5Line<1>((uint16 *)dstPtr, (const uint16 *)(srcPtr - pitch), (const uint16 *)srcPtr, width);
- break;
- case 2:
- interpolate5Line<2>((uint16 *)dstPtr, (const uint16 *)(srcPtr - pitch), (const uint16 *)srcPtr, width);
- break;
- case 3:
- interpolate5Line<2>((uint16 *)dstPtr, (const uint16 *)srcPtr, (const uint16 *)(srcPtr - pitch), width);
- break;
- case 4:
- interpolate5Line<1>((uint16 *)dstPtr, (const uint16 *)srcPtr, (const uint16 *)(srcPtr - pitch), width);
- break;
- }
-#endif
- dstPtr -= pitch;
- }
-
- return 1 + maxDstY - srcY;
-}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/common/scaler - New directory
- Next message: [Scummvm-cvs-logs] CVS: scummvm/common/scaler .cvsignore,NONE,1.1 2xsai.cpp,NONE,1.1 aspect.cpp,NONE,1.1 hq2x.cpp,NONE,1.1 hq3x.cpp,NONE,1.1 intern.h,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list