[Scummvm-cvs-logs] SF.net SVN: scummvm:[39710] scummvm/trunk/engines/cine

[buddha_ at users.sourceforge.net]

Revision: 39710
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39710&view=rev
Author:   buddha_
Date:     2009-03-27 20:03:38 +0000 (Fri, 27 Mar 2009)

Log Message:
-----------
Cine::Palette: Remove unnecessary and needlessly complicating saving of the last loaded palette data's endian type.

Modified Paths:
--------------
    scummvm/trunk/engines/cine/pal.cpp
    scummvm/trunk/engines/cine/pal.h

Modified: scummvm/trunk/engines/cine/pal.cpp
===================================================================
--- scummvm/trunk/engines/cine/pal.cpp	2009-03-27 19:11:00 UTC (rev 39709)
+++ scummvm/trunk/engines/cine/pal.cpp	2009-03-27 20:03:38 UTC (rev 39710)
@@ -222,10 +222,6 @@
 	return *this;
 }
 
-EndianType Palette::endianType() const {
-	return (_bigEndian ? CINE_BIG_ENDIAN : CINE_LITTLE_ENDIAN);
-}
-
 Graphics::PixelFormat Palette::colorFormat() const {
 	return _format;
 }
@@ -248,10 +244,6 @@
 	_bMax = (1 << _bBits) - 1;
 }
 
-void Palette::setEndianType(const EndianType endian) {
-	_bigEndian = isBigEndian(endian);
-}
-
 // a.k.a. transformPaletteRange
 Palette &Palette::saturatedAddColor(Palette& output, byte firstIndex, byte lastIndex, signed r, signed g, signed b) {
 	assert(firstIndex < colorCount() && lastIndex < colorCount());
@@ -292,7 +284,6 @@
 	assert(format.gShift / 8 == (format.gShift + MAX<int>(0, 8 - format.gLoss - 1)) / 8); // G must be inside one byte
 	assert(format.bShift / 8 == (format.bShift + MAX<int>(0, 8 - format.bLoss - 1)) / 8); // B must be inside one byte
 
-	setEndianType(endian);
 	setColorFormat(format);
 
 	_colors.clear();

Modified: scummvm/trunk/engines/cine/pal.h
===================================================================
--- scummvm/trunk/engines/cine/pal.h	2009-03-27 19:11:00 UTC (rev 39709)
+++ scummvm/trunk/engines/cine/pal.h	2009-03-27 20:03:38 UTC (rev 39710)
@@ -132,11 +132,6 @@
 
 	Palette &fillWithBlack();
 
-	/*! \brief The original endian type in which this palette was loaded.
-	 * \note This will always return either CINE_BIG_ENDIAN or CINE_LITTLE_ENDIAN (So no CINE_NATIVE_ENDIAN).
-	 */
-	EndianType endianType() const;
-
 	/*! \brief The original color format in which this palette was loaded. */
 	Graphics::PixelFormat colorFormat() const;
 
@@ -145,15 +140,13 @@
 
 private:
 	void setColorFormat(const Graphics::PixelFormat format);
-	void setEndianType(const EndianType endian);
 	Cine::Palette::Color saturatedAddColor(Cine::Palette::Color baseColor, signed r, signed g, signed b) const;
 
 private:
-	// The used source format, its endianness etc.
+	// The used source format and some values calculated from it
 	Graphics::PixelFormat _format;
 	uint _rBits, _gBits, _bBits;
 	uint _rMax, _gMax, _bMax;
-	bool _bigEndian;
 
 	Common::Array<Color> _colors;
 };


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