Attachment 1002 Details for Bug 661 – [FIXED_X11R68x] Patch for Xorg CVS 2004-10-03-trunk

[patch] [FIXED_X11R68x] Patch for Xorg CVS 2004-10-03-trunk

patch.gudiff (text/plain), 3.13 KB, created by Roland Mainz on 2004-10-03 22:32:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-10-03 22:32:35 UTC

Size: 3.13 KB

patch

obsolete

>Index: xc/ChangeLog
>===================================================================
>RCS file: /cvs/xorg/xc/ChangeLog,v
>retrieving revision 1.425
>diff -u -2 -0 -r1.425 ChangeLog
>--- xc/ChangeLog	4 Oct 2004 05:04:13 -0000	1.425
>+++ xc/ChangeLog	4 Oct 2004 05:30:13 -0000
>@@ -1,21 +1,28 @@
> 2004-10-03 Roland Mainz <roland.mainz@nrubsig.org>
>+        * xc/programs/Xserver/Xprint/ps/psout.c
>+        Bugzilla #661: Xprt producing spurious characters in PS
>+        output when using the bitmap cache (Originally reported
>+        against Solaris Xprt as Sun bug id #4369307, and 
>+        fixed in Solaris by Jay Hobson <jay.hobson@sun.com>).
>+
>+2004-10-03 Roland Mainz <roland.mainz@nrubsig.org>
>         * xc/programs/Xserver/Xprint/Init.c
>         * xc/programs/Xserver/Xprint/ps/Ps.h
>         * xc/programs/Xserver/Xprint/ps/PsArea.c
>         * xc/programs/Xserver/Xprint/ps/PsColor.c
>         * xc/programs/Xserver/Xprint/ps/PsInit.c
>         * xc/programs/Xserver/Xprint/ps/psout.c
>         * xc/programs/Xserver/Xprint/ps/psout.h
>         Bugzilla #1299: Add more visuals to the Postscript DDX (8bit
>         GrayScale/StaticGray, 1bit StaticGray and the basic
>         infratructure for "deep" visuals with more than 8bits per RGB
>         gun).
> 
> 2004-10-03 Vladimir Dergachev <volodya@mindspring.com>
> 
>        Modified:
>         * xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_mm_i2c.c
>        Remove debugging statement that cause loading of DLL modules
>        to fail.
> 
> 2004-10-03 Roland Mainz <roland.mainz@nrubsig.org>
>Index: xc/programs/Xserver/Xprint/ps/psout.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/ps/psout.c,v
>retrieving revision 1.4
>diff -u -2 -0 -r1.4 psout.c
>--- xc/programs/Xserver/Xprint/ps/psout.c	4 Oct 2004 05:04:14 -0000	1.4
>+++ xc/programs/Xserver/Xprint/ps/psout.c	4 Oct 2004 05:30:21 -0000
>@@ -1431,48 +1431,50 @@
>       }
>       else
>       {
>         PsOut_Color(self, self->ImgBClr);
>         PsOut_FillRect(self, self->ImgX, self->ImgY, self->SclW, self->SclH);
>         PsOut_Color(self, self->ImgFClr);
>       }
>     }
>     S_OutNum(self, (float)self->ImgX);
>     S_OutNum(self, (float)self->ImgY);
>     S_OutNum(self, (float)self->ImgW);
>     S_OutNum(self, (float)self->ImgH);
>     S_OutNum(self, (float)self->SclW);
>     S_OutNum(self, (float)self->SclH);
>     if( self->ImageFormat==1 ) S_OutTok(self, "Im1t", 1);
>     else                       S_OutTok(self, "Im24t", 1);
>     self->ImageFormat = 0;
>     self->RevImage    = 0;
>     return;
>   }
>-
>+  /*
>+   * Bug 4639307: Move flush before "> im" to get all of bitmap into ps file.
>+   */
>+  S_Flush(self);
> #ifdef BM_CACHE
>   if(self->start_image)
>     S_OutTok(self, "> im", 1);       /* new */
> #endif
>   self->ImageFormat = 0;
>   self->RevImage    = 0;
>-  S_Flush(self);
> #ifdef BM_CACHE
>   if(self->start_image)
>   {
>     self->start_image = 0;
>     S_OutTok(self, "gr", 0);
>   }
>   else
>     S_OutTok(self, "gr", 1);
> #else
>   S_OutTok(self, "gr", 1);
> #endif
> }
> 
> void
> PsOut_OutImageBytes(PsOutPtr self, int nBytes, char *bytes)
> {
>   int   i;
>   char  buf[5];
> 
>   if( (!self->ImageFormat) || self->ImgSkip ) return;

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 661: 314 | 1002

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.