Hello community, here is the log from the commit of package xgl checked in at Wed May 31 02:57:29 CEST 2006. -------- --- xgl/xgl.changes 2006-05-26 11:58:06.000000000 +0200 +++ xgl/xgl.changes 2006-05-30 01:22:10.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 30 01:20:14 CEST 2006 - dreveman@suse.de + +- Fix typo in xglFillSegment. (bnc #178234) + +------------------------------------------------------------------- Old: ---- 178234.diff New: ---- 178234-2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xgl.spec ++++++ --- /var/tmp/diff_new_pack.5IAKqZ/_old 2006-05-31 02:57:08.000000000 +0200 +++ /var/tmp/diff_new_pack.5IAKqZ/_new 2006-05-31 02:57:08.000000000 +0200 @@ -24,7 +24,7 @@ Requires: xgl-hardware-list Autoreqprov: on Version: cvs_060522 -Release: 2 +Release: 3 Summary: Xserver that uses OpenGL for its drawing operations. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 @@ -43,7 +43,7 @@ Patch2: xgl-xpstubs-link-hack.diff Patch3: xgl-maprules-tolower-fix.diff Patch4: 178214.diff -Patch5: 178234.diff +Patch5: 178234-2.diff %description Xgl is an Xserver that uses OpenGL for its drawing operations. Some @@ -82,7 +82,7 @@ patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-xpstubs-link-hack.diff || exit 1 patch -d xorg-* -p0 < $RPM_SOURCE_DIR/xgl-maprules-tolower-fix.diff || exit 1 patch -d xorg-* -p0 < $RPM_SOURCE_DIR/178214.diff || exit 1 -patch -d xorg-* -p0 < $RPM_SOURCE_DIR/178234.diff || exit 1 +patch -d xorg-* -p0 < $RPM_SOURCE_DIR/178234-2.diff || exit 1 %build PREFIX=$RPM_BUILD_ROOT/usr/X11R6/lib/xgl @@ -145,6 +145,8 @@ /var/adm/fillup-templates/sysconfig.displaymanager-%name %changelog -n xgl +* Tue May 30 2006 - dreveman@suse.de +- Fix typo in xglFillSegment. (bnc #178234) * Fri May 26 2006 - dreveman@suse.de - Adjust for capStyle correctly in xglFillSegment. (bnc #178234) - Add info logging. (bnc #178214) ++++++ 178234-2.diff ++++++ --- hw/xgl/xglfill.c 18 Jan 2006 07:15:54 -0000 1.9 +++ hw/xgl/xglfill.c 26 May 2006 08:24:30 -0000 @@ -585,15 +585,19 @@ { full.x1 = pSegInit->x1; full.x2 = pSegInit->x2; + if (pGC->capStyle != CapNotLast) + full.x2++; } else { full.x1 = pSegInit->x2; - full.x2 = pSegInit->x1; + full.x2 = pSegInit->x1 + 1; + if (pGC->capStyle == CapNotLast) + full.x1++; } full.x1 += pDrawable->x; - full.x2 += pDrawable->x + 1; + full.x2 += pDrawable->x; full.y1 = pSegInit->y1 + pDrawable->y; full.y2 = full.y1 + 1; } @@ -603,15 +607,19 @@ { full.y1 = pSegInit->y1; full.y2 = pSegInit->y2; + if (pGC->capStyle != CapNotLast) + full.y2++; } else { full.y1 = pSegInit->y2; - full.y2 = pSegInit->y1; + full.y2 = pSegInit->y1 + 1; + if (pGC->capStyle == CapNotLast) + full.y1++; } full.y1 += pDrawable->y; - full.y2 += pDrawable->y + 1; + full.y2 += pDrawable->y; full.x1 = pSegInit->x1 + pDrawable->x; full.x2 = full.x1 + 1; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de