Attachment 597852 Details for Bug 839707 – Patch ready for applying

[patch] Patch ready for applying

xwd.c.patch (text/plain), 1.59 KB, created by resler on 2012-07-12 16:53:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: resler

Created: 2012-07-12 16:53:27 UTC

Size: 1.59 KB

patch

obsolete

>--- ./xwd_521.c	2010-07-24 19:55:56.000000000 +0000
>+++ ./xwd_patch.c	2012-06-29 14:10:25.000000000 +0000
>@@ -186,7 +186,7 @@
> 	static unsigned		buffer_size;	/* size of image	*/
> 	unsigned char		*cptr1, *cptr2;
> 	int			status, i;
>-	XColor			xcolors[256];	/* color palette in X dump */
>+	XWDColor		xcolors[256];	/* color palette in X dump */
> 	int			win_name_size;	/* not used */
> 	unsigned		image_size();
> 	static unsigned long 	swaptest = 1;
>@@ -303,8 +303,8 @@
> 	/* Read in the color palette */
> 
> 	status  = fread((char *) xcolors, 1, 
>-		(int) (ras->ncolor * sizeof(XColor)), ras->fp);
>-	if (status != ras->ncolor * sizeof(XColor)) {
>+		(int) (ras->ncolor * sizeof(XWDColor)), ras->fp);
>+	if (status != ras->ncolor * sizeof(XWDColor)) {
> 		(void) ESprintf(RAS_E_NOT_IN_CORRECT_FORMAT,
> 			"XWDRead(\"%s\")", ras->name);
> 	}
>@@ -313,7 +313,7 @@
> 
> 	if (*(char *) &swaptest) {
> 		for (i = 0; i < ras->ncolor; i++) {
>-			_swaplong((char *) &xcolors[i].pixel, sizeof(long));
>+			_swaplong((char *) &xcolors[i].pixel, sizeof(xcolors[i].pixel));
> 			_swapshort((char *) &xcolors[i].red, 3 * sizeof(short));
> 		}
>         }
>@@ -469,7 +469,7 @@
> XWDWrite(ras)
> 	Raster	*ras;
> {
>-	XColor		xcolors[256];		/* color palette in X dump */
>+	XWDColor	xcolors[256];		/* color palette in X dump */
> 	int		nb;
> 	int		i;
> 	unsigned long	swaptest = 1;
>@@ -519,7 +519,7 @@
> 
> 	if (*(char *) &swaptest) {
> 		for (i = 0; i < ras->ncolor; i++) {
>-			_swaplong((char *) &xcolors[i].pixel, sizeof(long));
>+			_swaplong((char *) &xcolors[i].pixel, sizeof(xcolors[i].pixel));
> 			_swapshort((char *) &xcolors[i].red, 3 * sizeof(short));
> 		}
>         }

Actions: View | Diff

Attachments on bug 839707: 597832 | 597852 | 597991 | 597992 | 597993