shithub: purgatorio

Download patch

ref: d3d1b3b47ff80f451c6c9f8b7f1262fef6545f2b
parent: 249dc0489c7b24371e1f829e9c849fa7464f6c0c
author: henesy <devnull@localhost>
date: Sat Feb 29 19:33:56 EST 2020

fix merge errors

--- a/emu/port/win-x11a.c	Sat Feb 29 19:25:41 2020
+++ b/emu/port/win-x11a.c	Sat Feb 29 19:33:56 2020
@@ -341,33 +341,6 @@
 }
 
 static void
-copy16to16(Rectangle r)
-{
-	int dx, width;
-	u16int *dp, *wp, *edp, *lp;
-
-	width = Dx(r);
-	dx = Xsize - width;
-	dp = (u16int*)(gscreendata + ((r.min.y * Xsize) + r.min.x) * 2);
-	wp = (u16int*)(xscreendata + ((r.min.y * Xsize) + r.min.x) * 2);
-	edp = (u16int*)(gscreendata + ((r.max.y * Xsize) + r.max.x) * 2);
-
-	/* The pixel format should be the same as the underlying X display (see
-	   the xtruevisual function) unless a different channel format is
-	   explicitly specified on the command line, so just copy the pixel data
-	   without any processing. */
-
-	while(dp < edp) {
-		lp = dp + width;
-		while(dp < lp){
-			*wp++ = *dp++;
-		}
-		dp += dx;
-		wp += dx;
-	}
-}
-
-static void
 copy8to32(Rectangle r)
 {
 	int dx, width;