From db4d27d39be7335daa252b0b932ae573c4afa0fb Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 21 May 2004 20:02:15 +0000
Subject: [PATCH] fix blitting regression, causing lines on the border of
 cdtitles

---
 stepmania/src/SDL_utils.cpp | 44 +++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/stepmania/src/SDL_utils.cpp b/stepmania/src/SDL_utils.cpp
index 888721d3cf..c82b08d94c 100644
--- a/stepmania/src/SDL_utils.cpp
+++ b/stepmania/src/SDL_utils.cpp
@@ -843,6 +843,7 @@ static void blit_generic( SDL_Surface *src_surf, const SDL_Surface *dst_surf, in
 
 }
 
+/* Blit src onto dst. */
 void mySDL_BlitSurface( 
 	SDL_Surface *src, SDL_Surface *dst, int width, int height, bool ckey)
 {
@@ -886,6 +887,49 @@ void mySDL_BlitSurface(
 	else
 		/* We don't do RGBA->PAL. */
 		ASSERT(0);
+
+	/*
+	 * The destination surface may be larger than the source.  For example, we may be
+	 * blitting a 200x200 image onto a 256x256 surface for OpenGL.  Normally, that extra
+	 * space isn't actually used; we'll only render the image space.  However, bilinear
+	 * filtering will cause the lines of pixels at 201x... and ...x201 to be visible. We
+	 * need to make sure those pixels make sense.
+	 *
+	 * Previously, we just cleared the image to transparent or the color key.  This
+	 * has two problems.  First, we may not have space for a color key (an image with
+	 * 256 non-transparent palette colors).  Second, that's not completely correct;
+	 * it'll force the outside border of the image to filter to transparent.  If the image
+	 * is being tiled with another image, that may leave seams.
+	 *
+	 * (In some cases, filtering to transparent is preferable, particularly when displaying
+	 * a sprite in perspective.  If you want that, add blank space to the image explicitly.)
+	 *
+	 * Copy the last column (200x... -> 201x...), then the last row (...x200 -> ...x201).
+	 */
+
+	if( width < dst->w )
+	{
+		/* Duplicate the last column. */
+		int offset = dst->format->BytesPerPixel * (width-1);
+		Uint8 *p = (Uint8 *) dst->pixels + offset;
+
+		for( int y = 0; y < height; ++y )
+		{
+			Uint32 pixel = decodepixel( p, dst->format->BytesPerPixel );
+			encodepixel( p+dst->format->BytesPerPixel, dst->format->BytesPerPixel, pixel );
+
+			p += dst->pitch;
+		}
+	}
+
+
+	if( height < dst->h )
+	{
+		/* Duplicate the last row. */
+		char *srcp = (char *) dst->pixels;
+		srcp += dst->pitch * height;
+		memcpy( srcp + dst->pitch, srcp, dst->pitch );
+	}
 }
 
 /* This converts an image to a special 8-bit paletted format.  The palette is set up