[Scummvm-cvs-logs] SF.net SVN: scummvm:[41540] scummvm/branches/gsoc2009-16bit

[upthorn at users.sourceforge.net]

Revision: 41540
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41540&view=rev
Author:   upthorn
Date:     2009-06-15 10:10:22 +0000 (Mon, 15 Jun 2009)

Log Message:
-----------
made Graphics::PixelFormat(ColorMode) constructor explicit, removed Graphics::PixelFormat(int bitFormat) constructor that was never really implemented anyway

Modified Paths:
--------------
    scummvm/branches/gsoc2009-16bit/base/main.cpp
    scummvm/branches/gsoc2009-16bit/engines/engine.cpp
    scummvm/branches/gsoc2009-16bit/engines/scumm/scumm.cpp
    scummvm/branches/gsoc2009-16bit/graphics/pixelformat.h

Modified: scummvm/branches/gsoc2009-16bit/base/main.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/base/main.cpp	2009-06-15 09:45:19 UTC (rev 41539)
+++ scummvm/branches/gsoc2009-16bit/base/main.cpp	2009-06-15 10:10:22 UTC (rev 41540)
@@ -227,7 +227,7 @@
 		system.setGraphicsMode(ConfMan.get("gfx_mode").c_str());
 
 #ifdef ENABLE_16BIT
-		system.initFormat(Graphics::kFormatCLUT8);
+		system.initFormat(Graphics::PixelFormat(Graphics::kFormatCLUT8));
 #endif
 		system.initSize(320, 200);
 

Modified: scummvm/branches/gsoc2009-16bit/engines/engine.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/engine.cpp	2009-06-15 09:45:19 UTC (rev 41539)
+++ scummvm/branches/gsoc2009-16bit/engines/engine.cpp	2009-06-15 10:10:22 UTC (rev 41540)
@@ -126,7 +126,7 @@
 }
 void initGraphics(int width, int height, bool defaultTo1xScaler) {
 #ifdef ENABLE_16BIT
-	Graphics::PixelFormat format = Graphics::kFormatCLUT8;
+	Graphics::PixelFormat format(Graphics::kFormatCLUT8);
 	initGraphics(width,height,defaultTo1xScaler, format);
 }
 void initGraphics(int width, int height, bool defaultTo1xScaler, Graphics::PixelFormat format) {

Modified: scummvm/branches/gsoc2009-16bit/engines/scumm/scumm.cpp
===================================================================
--- scummvm/branches/gsoc2009-16bit/engines/scumm/scumm.cpp	2009-06-15 09:45:19 UTC (rev 41539)
+++ scummvm/branches/gsoc2009-16bit/engines/scumm/scumm.cpp	2009-06-15 10:10:22 UTC (rev 41540)
@@ -1085,7 +1085,7 @@
 					(_screenWidth * _textSurfaceMultiplier > 320));
 #ifdef ENABLE_16BIT
 	} else if (_game.features & GF_16BIT_COLOR) {
-		Graphics::PixelFormat format = Graphics::kFormatRGB555;
+		Graphics::PixelFormat format(Graphics::kFormatRGB555);
 		initGraphics(_screenWidth, _screenHeight, _screenWidth > 320, format);
 		if (format != _system->getScreenFormat())
 			return Common::kUnsupportedColorMode;

Modified: scummvm/branches/gsoc2009-16bit/graphics/pixelformat.h
===================================================================
--- scummvm/branches/gsoc2009-16bit/graphics/pixelformat.h	2009-06-15 09:45:19 UTC (rev 41539)
+++ scummvm/branches/gsoc2009-16bit/graphics/pixelformat.h	2009-06-15 10:10:22 UTC (rev 41540)
@@ -91,43 +91,10 @@
 		rShift = RShift, gShift = GShift, bShift = BShift, aShift = AShift;
 	}
 
-	//Copy constructor
-	//Is this necessary?
-	inline PixelFormat(const PixelFormat &format) {
-		bytesPerPixel = format.bytesPerPixel;
-
-		rLoss = format.rLoss;
-		gLoss = format.gLoss;
-		bLoss = format.bLoss;
-		aLoss = format.aLoss;
-
-		rShift = format.rShift;
-		gShift = format.gShift;
-		bShift = format.bShift;
-		aShift = format.aShift;
-	}
-
-	//Convenience constructor from bitformat number
-	//TODO: BGR support
-	//TODO: Specify alpha position
-/*	PixelFormat(int bitFormat) {
-		bytesPerPixel = ColorMasks<bitFormat>::kBytesPerPixel;
-
-		rLoss = 8 - ColorMasks<bitFormat>::kRedBits;
-		gLoss = 8 - ColorMasks<bitFormat>::kGreenBits;
-		bLoss = 8 - ColorMasks<bitFormat>::kBlueBits;
-		aLoss = 8 - ColorMasks<bitFormat>::kAlphaBits;
-
-		rShift = ColorMasks<bitFormat>::kRedShift;
-		gShift = ColorMasks<bitFormat>::kGreenShift;
-		bShift = ColorMasks<bitFormat>::kBlueShift;
-		aShift = ColorMasks<bitFormat>::kAlphaShift;
-	};*/
-
 	//Convenience constructor from enum type
 	//TODO: BGR support
 	//TODO: Specify alpha position
-	inline PixelFormat(ColorMode mode) {
+	explicit inline PixelFormat(ColorMode mode) {
 		switch (mode) {
 		case kFormatRGB555:
 			aLoss = 8;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.