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

buddha_ at users.sourceforge.net buddha_ at users.sourceforge.net
Sat Mar 28 18:04:46 CET 2009


Revision: 39728
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39728&view=rev
Author:   buddha_
Date:     2009-03-28 17:04:46 +0000 (Sat, 28 Mar 2009)

Log Message:
-----------
Cine::Palette: Revamp palette constants so they can be used for e.g. allocating a constant sized byte buffer from stack.

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

Modified: scummvm/trunk/engines/cine/pal.h
===================================================================
--- scummvm/trunk/engines/cine/pal.h	2009-03-28 16:35:54 UTC (rev 39727)
+++ scummvm/trunk/engines/cine/pal.h	2009-03-28 17:04:46 UTC (rev 39728)
@@ -30,15 +30,21 @@
 
 namespace Cine {
 
+// Constants related to kLowPalFormat
+#define kLowPalBytesPerColor 2
+#define kLowPalNumColors 16
+#define kLowPalNumBytes ((kLowPalNumColors) * (kLowPalBytesPerColor))
+
 /*! \brief Low resolution (9-bit) color format used in Cine's 16-color modes. */
-static const Graphics::PixelFormat kLowPalFormat  = {2, 5, 5, 5, 8, 8, 4,  0, 0};
-static const int kLowPalNumColors = 16;
-static const int kLowPalNumBytes = kLowPalNumColors * kLowPalFormat.bytesPerPixel;
+static const Graphics::PixelFormat kLowPalFormat  = {kLowPalBytesPerColor, 5, 5, 5, 8, 8, 4, 0, 0};
 
+// Constants related to kHighPalFormat
+#define kHighPalBytesPerColor 3
+#define kHighPalNumColors 256
+#define kHighPalNumBytes ((kHighPalNumColors) * (kHighPalBytesPerColor))
+
 /*! \brief High resolution (24-bit) color format used in Cine's 256-color modes. */
-static const Graphics::PixelFormat kHighPalFormat = {3, 0, 0, 0, 8, 0, 8, 16, 0};
-static const int kHighPalNumColors = 256;
-static const int kHighPalNumBytes = kHighPalNumColors * kHighPalFormat.bytesPerPixel;
+static const Graphics::PixelFormat kHighPalFormat = {kHighPalBytesPerColor, 0, 0, 0, 8, 0, 8, 16, 0};
 
 /*! \brief The color format used by OSystem's setPalette-function. */
 static const Graphics::PixelFormat kSystemPalFormat = {4, 0, 0, 0, 8, 0, 8, 16, 0};


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




More information about the Scummvm-git-logs mailing list