[Scummvm-cvs-logs] CVS: scummvm/common module.mk,1.21,1.22 scaler.cpp,1.67,1.68 scaler.h,1.30,1.31

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30362/common

Modified Files:
	module.mk scaler.cpp scaler.h 
Log Message:
Added --disable-hq and --disable-scumm-7-8 options. Also improved
DISABLE_HE so more HE-specific code gets excluded.


Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/module.mk,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- module.mk	8 May 2005 22:54:16 -0000	1.21
+++ module.mk	14 May 2005 22:56:37 -0000	1.22
@@ -18,13 +18,16 @@
 	common/scaler.o \
 	common/scaler/2xsai.o \
 	common/scaler/aspect.o \
-	common/scaler/hq2x.o \
-	common/scaler/hq3x.o \
 	common/scaler/scale2x.o \
 	common/scaler/scale3x.o \
 	common/scaler/scalebit.o \
 	common/scaler/thumbnail.o
 
+ifndef DISABLE_HQ_SCALERS
+MODULE_OBJS += \
+	common/scaler/hq2x.o \
+	common/scaler/hq3x.o
+
 ifdef HAVE_NASM
 MODULE_OBJS += \
 	common/scaler/hq2x_i386.o \
@@ -33,6 +36,8 @@
 
 endif
 
+endif
+
 MODULE_DIRS += \
 	common \
 	common/scaler

Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- scaler.cpp	27 Apr 2005 08:43:23 -0000	1.67
+++ scaler.cpp	14 May 2005 22:56:37 -0000	1.68
@@ -27,6 +27,7 @@
 
 int gBitFormat = 565;
 
+#ifndef DISABLE_HQ_SCALERS
 // RGB-to-YUV lookup table
 extern "C" {
 
@@ -71,6 +72,7 @@
 uint *RGBtoYUV = RGBtoYUVstorage;
 uint LUT16to32[65536];
 }
+#endif
 
 static const uint16 dotmatrix_565[16] = {
 	0x01E0, 0x0007, 0x3800, 0x0000,
@@ -101,6 +103,9 @@
 	InitLUT(BitFormat);
 }
 
+#ifdef DISABLE_HQ_SCALERS
+void InitLUT(uint32 BitFormat) {}
+#else
 void InitLUT(uint32 BitFormat) {
 	int r, g, b;
 	int Y, u, v;
@@ -129,6 +134,7 @@
 		}
 	}
 }
+#endif
 
 /**
  * Trivial 'scaler' - in fact it doesn't do any scaling but just copies the

Index: scaler.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- scaler.h	8 May 2005 22:54:16 -0000	1.30
+++ scaler.h	14 May 2005 22:56:37 -0000	1.31
@@ -45,8 +45,11 @@
 DECLARE_SCALER(Normal1o5x);
 DECLARE_SCALER(TV2x);
 DECLARE_SCALER(DotMatrix);
+
+#ifndef DISABLE_HQ_SCALERS
 DECLARE_SCALER(HQ2x);
 DECLARE_SCALER(HQ3x);
+#endif
 
 FORCEINLINE int real2Aspect(int y) {
 	return y + (y + 1) / 5;