shithub: purgatorio

Info  •  Files  •  Log  •  Branches

fix merge errors

--- a/emu/port/win-x11a.c

+++ b/emu/port/win-x11a.c

@@ -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;