[Scummvm-cvs-logs] CVS: scummvm/graphics animation.cpp,1.26,1.27 animation.h,1.14,1.15

[Torbjörn Andersson]

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

Modified Files:
	animation.cpp animation.h 
Log Message:
...and since RGBToColor() returns OverlayColor, let's use that datatype
instead of uint16. (I never realized that we could use RGBToColor() here
myself. Good job in spotting that!)


Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/animation.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- animation.cpp	26 Apr 2005 10:27:53 -0000	1.26
+++ animation.cpp	26 Apr 2005 11:05:06 -0000	1.27
@@ -376,11 +376,11 @@
 	int16 *Cb_g_tab = &_colorTab[2 * 256];
 	int16 *Cb_b_tab = &_colorTab[3 * 256];
 
-	_rgbToPix = (uint16 *)malloc(3 * 768 * sizeof(uint16));
+	_rgbToPix = (OverlayColor *)malloc(3 * 768 * sizeof(OverlayColor));
 
-	uint16 *r_2_pix_alloc = &_rgbToPix[0 * 768];
-	uint16 *g_2_pix_alloc = &_rgbToPix[1 * 768];
-	uint16 *b_2_pix_alloc = &_rgbToPix[2 * 768];
+	OverlayColor *r_2_pix_alloc = &_rgbToPix[0 * 768];
+	OverlayColor *g_2_pix_alloc = &_rgbToPix[1 * 768];
+	OverlayColor *b_2_pix_alloc = &_rgbToPix[2 * 768];
 
 	int16 CR, CB;
 	int i;

Index: animation.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/graphics/animation.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- animation.h	12 Mar 2005 18:55:40 -0000	1.14
+++ animation.h	26 Apr 2005 11:05:06 -0000	1.15
@@ -109,7 +109,7 @@
 	OverlayColor *_overlay;
 	int _bitFormat;
 	int16 *_colorTab;
-	uint16 *_rgbToPix;
+	OverlayColor *_rgbToPix;
 #endif
 
 public: