[Scummvm-cvs-logs] scummvm master -> 22489cbf8ec58e26fe1b3db41c4f6d398b34fd30
lordhoto
lordhoto at gmail.com
Sun Feb 20 21:40:47 CET 2011
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
16be240ab1 KYRA: Fix regression in Screen::setInterfacePalette.
75ee5af7c9 GRAPHICS: Remove leftover RGBA reference in PaletteManager documentation.
bb2daae936 AGI: Remove leftover RGBA reference in comments.
10c7c5327a CRUISE: Remove leftover RGBA reference.
22489cbf8e TESTBED: Adapt documentation to the palette RGBA->RGB change.
Commit: 16be240ab1260117c0c9affe9cb4037e847a5df2
https://github.com/scummvm/scummvm/commit/16be240ab1260117c0c9affe9cb4037e847a5df2
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-02-20T12:37:39-08:00
Commit Message:
KYRA: Fix regression in Screen::setInterfacePalette.
This fixes an out of bounds write introduced with 9216c7e.
Changed paths:
engines/kyra/screen.cpp
diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 3eea7aa..a675461 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -741,7 +741,6 @@ void Screen::setInterfacePalette(const Palette &pal, uint8 r, uint8 g, uint8 b)
screenPal[3 * i + 1] = (g * 0xFF) / 0x3F;
screenPal[3 * i + 2] = (b * 0xFF) / 0x3F;
}
- screenPal[4 * i + 3] = 0;
}
_paletteChanged = true;
Commit: 75ee5af7c964ec9b37d9c0ba3cbaafb2b0d737de
https://github.com/scummvm/scummvm/commit/75ee5af7c964ec9b37d9c0ba3cbaafb2b0d737de
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-02-20T12:38:40-08:00
Commit Message:
GRAPHICS: Remove leftover RGBA reference in PaletteManager documentation.
Changed paths:
graphics/palette.h
diff --git a/graphics/palette.h b/graphics/palette.h
index 3e8652b..8d7fdbd 100644
--- a/graphics/palette.h
+++ b/graphics/palette.h
@@ -53,7 +53,7 @@ public:
* (transparency) value. Then the second color starts, and so on. So memory
* looks like this: R1-G1-B1-R2-G2-B2-R3-...
*
- * @param colors the new palette data, in interleaved RGBA format
+ * @param colors the new palette data, in interleaved RGB format
* @param start the first palette entry to be updated
* @param num the number of palette entries to be updated
*
@@ -88,7 +88,7 @@ public:
* memcmp(origPal, obtainedPal, num*3) == 0
*
* @see setPalette
- * @param colors the palette data, in interleaved RGBA format
+ * @param colors the palette data, in interleaved RGB format
* @param start the first platte entry to be read
* @param num the number of palette entries to be read
*
Commit: bb2daae936783e844dcc00a3b84e7f811e4f7264
https://github.com/scummvm/scummvm/commit/bb2daae936783e844dcc00a3b84e7f811e4f7264
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-02-20T12:39:29-08:00
Commit Message:
AGI: Remove leftover RGBA reference in comments.
Changed paths:
engines/agi/graphics.cpp
diff --git a/engines/agi/graphics.cpp b/engines/agi/graphics.cpp
index b119812..58982a2 100644
--- a/engines/agi/graphics.cpp
+++ b/engines/agi/graphics.cpp
@@ -927,7 +927,7 @@ static const byte appleIIgsMouseCursor[] = {
};
/**
- * RGBA-palette for the black and white SCI and Apple IIGS arrow cursors.
+ * RGB-palette for the black and white SCI and Apple IIGS arrow cursors.
*/
static const byte sciMouseCursorPalette[] = {
0x00, 0x00, 0x00, // Black
@@ -956,7 +956,7 @@ static const byte amigaMouseCursor[] = {
};
/**
- * RGBA-palette for the Amiga-style arrow cursor
+ * RGB-palette for the Amiga-style arrow cursor
* and the Amiga-style busy cursor.
*/
static const byte amigaMouseCursorPalette[] = {
Commit: 10c7c5327a24d9274c83d0b29a00cffbbced23fc
https://github.com/scummvm/scummvm/commit/10c7c5327a24d9274c83d0b29a00cffbbced23fc
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-02-20T12:39:29-08:00
Commit Message:
CRUISE: Remove leftover RGBA reference.
Changed paths:
engines/cruise/gfxModule.cpp
diff --git a/engines/cruise/gfxModule.cpp b/engines/cruise/gfxModule.cpp
index 59561de..f9ab193 100644
--- a/engines/cruise/gfxModule.cpp
+++ b/engines/cruise/gfxModule.cpp
@@ -273,15 +273,15 @@ static void mergeClipRects() {
}
void gfxModuleData_updatePalette() {
- byte paletteRGBA[256 * 3];
+ byte paletteRGB[256 * 3];
if (palDirtyMax != -1) {
for (int i = palDirtyMin; i <= palDirtyMax; i++) {
- paletteRGBA[i * 3 + 0] = lpalette[i].R;
- paletteRGBA[i * 3 + 1] = lpalette[i].G;
- paletteRGBA[i * 3 + 2] = lpalette[i].B;
+ paletteRGB[i * 3 + 0] = lpalette[i].R;
+ paletteRGB[i * 3 + 1] = lpalette[i].G;
+ paletteRGB[i * 3 + 2] = lpalette[i].B;
}
- g_system->getPaletteManager()->setPalette(paletteRGBA + palDirtyMin*3, palDirtyMin, palDirtyMax - palDirtyMin + 1);
+ g_system->getPaletteManager()->setPalette(paletteRGB + palDirtyMin*3, palDirtyMin, palDirtyMax - palDirtyMin + 1);
palDirtyMin = 256;
palDirtyMax = -1;
}
Commit: 22489cbf8ec58e26fe1b3db41c4f6d398b34fd30
https://github.com/scummvm/scummvm/commit/22489cbf8ec58e26fe1b3db41c4f6d398b34fd30
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-02-20T12:39:30-08:00
Commit Message:
TESTBED: Adapt documentation to the palette RGBA->RGB change.
Changed paths:
engines/testbed/graphics.h
diff --git a/engines/testbed/graphics.h b/engines/testbed/graphics.h
index 01c76ef..a4e698b 100644
--- a/engines/testbed/graphics.h
+++ b/engines/testbed/graphics.h
@@ -79,7 +79,7 @@ public:
private:
/**
- * A Palette consists of 4 components RGBA.
+ * A Palette consists of 3 components RGB.
* As of now we only take 3 colors
* 0 (R:0, G:0, B:0) Black (kColorBlack)
* 1 (R:255, G:255, B:255) White (kColorWhite)
More information about the Scummvm-git-logs
mailing list