From 70c9731810b28e910270429b2e5d16e2fe92f604 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Fri, 26 Jun 2009 22:30:52 +0000
Subject: SCI: starting to restore RGB color functionality

svn-id: r41904
---
 engines/sci/gfx/gfx_pixmap_scale.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'engines/sci/gfx/gfx_pixmap_scale.cpp')

diff --git a/engines/sci/gfx/gfx_pixmap_scale.cpp b/engines/sci/gfx/gfx_pixmap_scale.cpp
index 52c7b12396..37843743b9 100644
--- a/engines/sci/gfx/gfx_pixmap_scale.cpp
+++ b/engines/sci/gfx/gfx_pixmap_scale.cpp
@@ -70,14 +70,11 @@ void _gfx_xlate_pixmap_unfiltered(gfx_mode_t *mode, gfx_pixmap_t *pxm, int scale
 	// Calculate all colors
 	for (i = 0; i < pxm->colors_nr(); i++) {
 		int col;
-
 		const PaletteEntry& color = pxm->palette->getColor(i);
 		if (mode->palette)
 			col = color.parent_index;
 		else {
-			col = mode->red_mask & ((EXTEND_COLOR(color.r)) >> mode->red_shift);
-			col |= mode->green_mask & ((EXTEND_COLOR(color.g)) >> mode->green_shift);
-			col |= mode->blue_mask & ((EXTEND_COLOR(color.b)) >> mode->blue_shift);
+			col = mode->format.ARGBToColor(0, color.r, color.g, color.b);
 			col |= alpha_ormask;
 		}
 		result_colors[i] = col;
-- 
cgit v1.2.3