aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorJordi Vilalta Prat2008-01-27 19:47:41 +0000
committerJordi Vilalta Prat2008-01-27 19:47:41 +0000
commit66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985 (patch)
treee27aadabecd8dd910884280e6559ff9c94c3d73c /graphics
parent278857698dc7b1623096fe1ad12511dc4c886c7e (diff)
downloadscummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.tar.gz
scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.tar.bz2
scummvm-rg350-66e9d4f5e8f35b28f8abd9ce53a0da4da3ce8985.zip
Removed trailing spaces.
svn-id: r30664
Diffstat (limited to 'graphics')
-rw-r--r--graphics/colormasks.h14
-rw-r--r--graphics/module.mk2
-rw-r--r--graphics/scaler.cpp4
-rw-r--r--graphics/scaler/hq2x_i386.asm12
-rw-r--r--graphics/scaler/hq3x_i386.asm14
5 files changed, 23 insertions, 23 deletions
diff --git a/graphics/colormasks.h b/graphics/colormasks.h
index b8bfe26535..5b9f0517a9 100644
--- a/graphics/colormasks.h
+++ b/graphics/colormasks.h
@@ -33,7 +33,7 @@ struct ColorMasks {
/*
The ColorMasks template can be used to map bit format values
(like 555, 565, 1555, 4444) to corresponding bit masks and shift values.
-Currently this is only meant for
+Currently this is only meant for
The meaning of these is masks is the following:
kBytesPerPixel
@@ -41,17 +41,17 @@ The meaning of these is masks is the following:
kRedMask, kGreenMask, kBlueMask
-> bitmask, and this with the color to select only the bits of the corresponding color
-
+
The k*Bits and k*Shift values can be used to extract R,G,B. I.e. to get
the red color component of a pixel, as a 8-bit value, you would write
-
+
R = ((color & kRedMask) >> kRedShift) << (8-kRedBits)
-
+
Actually, instead of the simple left shift, one might want to use somewhat
- more sophisticated code (which fills up the least significant bits with
+ more sophisticated code (which fills up the least significant bits with
appropriate data).
-
-
+
+
The highBits / lowBits / qhighBits / qlowBits are special values that are
used in the super-optimized interpolation functions in scaler/intern.h
and scaler/aspect.cpp. Currently they are only available in 555 and 565 mode.
diff --git a/graphics/module.mk b/graphics/module.mk
index 4ab8b1450e..93e2db26c5 100644
--- a/graphics/module.mk
+++ b/graphics/module.mk
@@ -41,5 +41,5 @@ endif
endif
-# Include common rules
+# Include common rules
include $(srcdir)/rules.mk
diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp
index e492a8a58b..0afe756034 100644
--- a/graphics/scaler.cpp
+++ b/graphics/scaler.cpp
@@ -78,10 +78,10 @@ template<class T>
void InitLUT() {
int r, g, b;
int Y, u, v;
-
+
assert(T::kBytesPerPixel == 2);
- // Allocate the YUV/LUT buffers on the fly if needed.
+ // Allocate the YUV/LUT buffers on the fly if needed.
if (RGBtoYUV == 0)
RGBtoYUV = (uint32 *)malloc(65536 * sizeof(uint32));
if (LUT16to32 == 0)
diff --git a/graphics/scaler/hq2x_i386.asm b/graphics/scaler/hq2x_i386.asm
index ee8cd4d8b3..cc0f306c14 100644
--- a/graphics/scaler/hq2x_i386.asm
+++ b/graphics/scaler/hq2x_i386.asm
@@ -503,31 +503,31 @@ _hq2x_16:
mov ebx,[nextline]
movq mm7,[esi+ebx-2]
movd eax,mm5
- movzx edx,ax
+ movzx edx,ax
mov [w1],edx
shr eax,16
mov [w2],eax
psrlq mm5,32
movd eax,mm5
- movzx edx,ax
+ movzx edx,ax
mov [w3],edx
movd eax,mm6
- movzx edx,ax
+ movzx edx,ax
mov [w4],edx
shr eax,16
mov [w5],eax
psrlq mm6,32
movd eax,mm6
- movzx edx,ax
+ movzx edx,ax
mov [w6],edx
movd eax,mm7
- movzx edx,ax
+ movzx edx,ax
mov [w7],edx
shr eax,16
mov [w8],eax
psrlq mm7,32
movd eax,mm7
- movzx edx,ax
+ movzx edx,ax
mov [w9],edx
.flags
mov ebx,[_RGBtoYUV]
diff --git a/graphics/scaler/hq3x_i386.asm b/graphics/scaler/hq3x_i386.asm
index 3b84c6c988..523d06a2a4 100644
--- a/graphics/scaler/hq3x_i386.asm
+++ b/graphics/scaler/hq3x_i386.asm
@@ -317,7 +317,7 @@ SECTION .text
%macro PIXEL12_3 0
Interp3 [edi+ebx+4],[w6]
-%endmacro
+%endmacro
%macro PIXEL12_6 0
Interp1 [edi+ebx+4],[w6],eax
@@ -441,31 +441,31 @@ _hq3x_16:
mov ebx,[nextline]
movq mm7,[esi+ebx-2]
movd eax,mm5
- movzx edx,ax
+ movzx edx,ax
mov [w1],edx
shr eax,16
mov [w2],eax
psrlq mm5,32
movd eax,mm5
- movzx edx,ax
+ movzx edx,ax
mov [w3],edx
movd eax,mm6
- movzx edx,ax
+ movzx edx,ax
mov [w4],edx
shr eax,16
mov [w5],eax
psrlq mm6,32
movd eax,mm6
- movzx edx,ax
+ movzx edx,ax
mov [w6],edx
movd eax,mm7
- movzx edx,ax
+ movzx edx,ax
mov [w7],edx
shr eax,16
mov [w8],eax
psrlq mm7,32
movd eax,mm7
- movzx edx,ax
+ movzx edx,ax
mov [w9],edx
.flags
mov ebx,[_RGBtoYUV]