[Scummvm-cvs-logs] scummvm master -> 9afc89e67c287c3253e20a0a724774e84fa244f3

lordhoto lordhoto at gmail.com
Sun Feb 20 21:46:18 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9afc89e67c GRAPHICS: Let PNG::getPalette take an uint16 for the palette entry count.


Commit: 9afc89e67c287c3253e20a0a724774e84fa244f3
    https://github.com/scummvm/scummvm/commit/9afc89e67c287c3253e20a0a724774e84fa244f3
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-02-20T12:43:24-08:00

Commit Message:
GRAPHICS: Let PNG::getPalette take an uint16 for the palette entry count.

This is in analogy to r55742 / 2f08dcb.

I also took the freedom to clarify that the PNG loader uses a RGBA palette
format.

Changed paths:
    graphics/png.h



diff --git a/graphics/png.h b/graphics/png.h
index b2ba7ac..70f2e4b 100644
--- a/graphics/png.h
+++ b/graphics/png.h
@@ -117,9 +117,11 @@ public:
 	}
 
 	/**
-	 * Returns the palette of the specified PNG8 image
+	 * Returns the palette of the specified PNG8 image.
+	 *
+	 * Note that the palette's format is RGBA.
 	 */
-	void getPalette(byte *palette, byte &entries) {
+	void getPalette(byte *palette, uint16 &entries) {
 		if (_header.colorType != kIndexed)
 			error("Palette requested for a non-indexed PNG");
 		palette = _palette;






More information about the Scummvm-git-logs mailing list