rpms
/
gd
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- added 'thick' - variable support for AA line (#198042)

This commit is contained in:
Ivana Varekova 2006-11-16 13:46:53 +00:00
parent 891fdc6e3f
commit f4776b8e91
2 changed files with 77 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
gd-2.0.33-AALineThick.patch Normal file
View File

@ -0,0 +1,71 @@
--- gd-2.0.33/gd.c.pom 2006-11-16 14:29:57.000000000 +0100
+++ gd-2.0.33/gd.c 2006-11-16 14:30:44.000000000 +0100
@@ -3075,6 +3075,8 @@
/* keep them as 32bits */
long x, y, inc;
long dx, dy,tmp;
+ int w, wid, wstart;
+ int thick = im->thick;
if (!im->trueColor) {
/* TBB: don't crash when the image is of the wrong type */
gdImageLine(im, x1, y1, x2, y2, col);
@@ -3087,12 +3089,30 @@
return;
dx = x2 - x1;
dy = y2 - y1;
-
if (dx == 0 && dy == 0) {
/* TBB: allow setting points */
gdImageSetAAPixelColor(im, x1, y1, col, 0xFF);
return;
}
+ else {
+ double ag;
+ if (dy < dx)
+ ag = cos (atan2 (dy, dx));
+ else
+ ag = sin (atan2 (dy, dx));
+ if (ag != 0)
+ {
+ wid = thick / ag;
+ }
+ else
+ {
+ wid = 1;
+ }
+ if (wid == 0)
+ {
+ wid = 1;
+ }
+ }
if (abs(dx) > abs(dy)) {
if (dx < 0) {
tmp = x1;
@@ -3109,8 +3129,11 @@
inc = (dy * 65536) / dx;
/* TBB: set the last pixel for consistency (<=) */
while ((x >> 16) <= x2) {
- gdImageSetAAPixelColor(im, x >> 16, y >> 16, col, (y >> 8) & 0xFF);
- gdImageSetAAPixelColor(im, x >> 16, (y >> 16) + 1,col, (~y >> 8) & 0xFF);
+ wstart = (y >> 16) - wid / 2;
+ for (w = wstart; w < wstart + wid; w++) {
+ gdImageSetAAPixelColor(im, (x >> 16) , w , col , (y >> 8) & 0xFF);
+ gdImageSetAAPixelColor(im, (x >> 16) , w + 1 , col, (~y >> 8) & 0xFF);
+ }
x += (1 << 16);
y += inc;
}
@@ -3130,8 +3153,11 @@
inc = (dx * 65536) / dy;
/* TBB: set the last pixel for consistency (<=) */
while ((y>>16) <= y2) {
- gdImageSetAAPixelColor(im, x >> 16, y >> 16, col, (x >> 8) & 0xFF);
- gdImageSetAAPixelColor(im, (x >> 16) + 1, (y >> 16),col, (~x >> 8) & 0xFF);
+ wstart = (x >> 16) - wid / 2;
+ for (w = wstart; w < wstart + wid; w++) {
+ gdImageSetAAPixelColor(im, w , y >> 16 , col, (x >> 8) & 0xFF);
+ gdImageSetAAPixelColor(im, w + 1, y >> 16, col, (~x >> 8) & 0xFF);
+ }
x += inc;
y += (1<<16);
}

7
gd.spec
View File

@ -1,7 +1,7 @@
Summary: A graphics library for quick creation of PNG or JPEG images
Name: gd
Version: 2.0.33
Release: 9.4%{?dist}
Release: 10%{?dist}
Group: System Environment/Libraries
License: BSD-style
URL: http://www.boutell.com/gd/
@ -13,6 +13,7 @@ Patch3: gd-2.0.33-multilib.patch
Patch4: gd-loop.patch
Patch5: gd-sparc64.patch
Patch6: gd-2.0.33-overflow.patch
Patch7: gd-2.0.33-AALineThick.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: freetype-devel, fontconfig-devel, libX11-devel, libXpm-devel
BuildRequires: libjpeg-devel, libpng-devel, zlib-devel, pkgconfig
@ -59,6 +60,7 @@ files for gd, a graphics library for creating PNG and JPEG graphics.
%patch4 -p1 -b .loop
%patch5 -p1 -b .sparc64
%patch6 -p1 -b .overflow
%patch7 -p1 -b .AALineThick
%build
%configure --disable-rpath
@ -98,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Nov 16 2006 Ivana Varekova <varekova@redhat.com> 2.0.33-10
- added 'thick' - variable support for AA line (#198042)
* Tue Oct 31 2006 Adam Tkac <atkac@redhat.com> 2.0.33-9.4
- patched some additionals overflows in gd (#175414)