[Scummvm-git-logs] scummvm master -> 2da99ab0dc8f71d00f89f0a45e4149844a17f037

sev- sev at scummvm.org
Sun Sep 29 16:40:15 CEST 2019


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:
2da99ab0dc GRAPHICS: Fix NinePatch palette length.


Commit: 2da99ab0dc8f71d00f89f0a45e4149844a17f037
    https://github.com/scummvm/scummvm/commit/2da99ab0dc8f71d00f89f0a45e4149844a17f037
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-09-29T16:40:06+02:00

Commit Message:
GRAPHICS: Fix NinePatch palette length.

Byte did not allow to have 256 color palettes.

Changed paths:
    graphics/nine_patch.cpp
    graphics/nine_patch.h


diff --git a/graphics/nine_patch.cpp b/graphics/nine_patch.cpp
index ddaf9ab..4545750 100644
--- a/graphics/nine_patch.cpp
+++ b/graphics/nine_patch.cpp
@@ -203,7 +203,7 @@ bad_bitmap:
 	}
 }
 
-void NinePatchBitmap::blit(Graphics::Surface &target, int dx, int dy, int dw, int dh, byte *palette, byte numColors) {
+void NinePatchBitmap::blit(Graphics::Surface &target, int dx, int dy, int dw, int dh, byte *palette, int numColors) {
 	/* don't draw bitmaps that are smaller than the fixed area */
 	if (dw < _h._fix || dh < _v._fix)
 		return;
@@ -347,7 +347,7 @@ static inline uint32 dist(uint32 a, uint32 b) {
 	return b - a;
 }
 
-byte NinePatchBitmap::closestGrayscale(uint32 color, byte* palette, byte paletteLength) {
+byte NinePatchBitmap::closestGrayscale(uint32 color, byte* palette, int paletteLength) {
 	if (!_cached_colors.contains(color)) {
 		byte target = grayscale(color);
 		byte bestNdx = 0;
diff --git a/graphics/nine_patch.h b/graphics/nine_patch.h
index 6674099..d341919 100644
--- a/graphics/nine_patch.h
+++ b/graphics/nine_patch.h
@@ -88,7 +88,7 @@ public:
 	NinePatchBitmap(Graphics::TransparentSurface *bmp, bool owns_bitmap);
 	~NinePatchBitmap();
 
-	void blit(Graphics::Surface &target, int dx, int dy, int dw, int dh, byte *palette = NULL, byte numColors = 0);
+	void blit(Graphics::Surface &target, int dx, int dy, int dw, int dh, byte *palette = NULL, int numColors = 0);
 	void blitClip(Graphics::Surface &target, Common::Rect clip, int dx, int dy, int dw, int dh);
 
 	int getWidth() { return _width; }
@@ -106,7 +106,7 @@ private:
 	byte getColorIndex(uint32 target, byte *palette);
 	uint32 grayscale(uint32 color);
 	uint32 grayscale(byte r, byte g, byte b);
-	byte closestGrayscale(uint32 color, byte* palette, byte paletteLength);
+	byte closestGrayscale(uint32 color, byte* palette, int paletteLength);
 };
 
 } // end of namespace Graphics





More information about the Scummvm-git-logs mailing list