Attachment 50424 Details for Bug 118009

needed to build xv with gcc-4

xv-3.10a-gcc4.patch (text/x-patch), 1.51 KB, created by Harald Koenig on 2005-09-20 14:18:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harald Koenig

Created: 2005-09-20 14:18:27 UTC

Size: 1.51 KB

patch

obsolete

>--- xvimage.c~	2005-09-17 15:47:23.207482750 +0200
>+++ xvimage.c	2005-09-20 16:02:38.279404500 +0200
>@@ -2156,6 +2156,8 @@
>     unsigned long xcol;
>     int           bperpix, bperline;
>     byte         *imagedata, *lip, *ip, *pp;
>+    CARD16 	 *ip16;
>+    CARD32	 *ip32;
> 
> 
>     xim = XCreateImage(theDisp, theVisual, dispDEEP, ZPixmap, 0, NULL,
>@@ -2208,7 +2210,7 @@
> 	  for (i=0; i<high; i++, lip+=bperline, picp+=(size_t)wide*3) {
> 	    memcpy(row_buf, picp, (size_t)wide * 3);
> 	    nc = fs2_dither(fs, row_buf, nc, 1, wide);
>-	    for (j=0, ip=lip, pp=row_buf; j<wide; j++) {
>+	    for (j=0, ip=lip, ip16=(CARD16*)lip, pp=row_buf; j<wide; j++) {
> 
> 	      xcol  = screen_rgb[0][*pp++];
> 	      xcol |= screen_rgb[1][*pp++];
>@@ -2219,7 +2221,7 @@
> 		*ip++ = xcol & 0xff;
> 		break;
> 	      case 16:
>-		*((CARD16 *)ip)++ = (CARD16)xcol;
>+		*ip16++ = (CARD16)xcol;
> 		break;
> 	      }
> 	    }
>@@ -2237,7 +2239,7 @@
> 
>     lip = imagedata;  pp = pic24;
>     for (i=0; i<high; i++, lip+=bperline) {
>-      for (j=0, ip=lip; j<wide; j++) {
>+      for (j=0, ip=lip, ip16=(CARD16*)lip, ip32=(CARD32*)lip; j<wide; j++) {
> 
> 	xcol  = screen_rgb[0][*pp++];
> 	xcol |= screen_rgb[1][*pp++];
>@@ -2248,7 +2250,7 @@
> 	  *ip++ = xcol & 0xff;
> 	  break;
> 	case 16:
>-	  *((CARD16 *)ip)++ = (CARD16)xcol;
>+	  *ip16++ = (CARD16)xcol;
> 	  break;
> 	case 24:
> 	  *ip++ = (xcol >> 16) & 0xff;
>@@ -2256,7 +2258,7 @@
> 	  *ip++ =  xcol        & 0xff;
> 	  break;
> 	case 32:
>-	  *((CARD32 *)ip)++ = (CARD32)xcol;
>+	  *ip32++ = (CARD32)xcol;
> 	  break;
> 	}
>       }

Actions: View

Attachments on bug 118009: 50424