Attachment #31318 for bug #52235

View | Details | Raw Unified | Return to bug 52235
Collapse All | Expand All

Lines 6-12 Link Here

(-)Makefile (-2 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= gd	8	PORTNAME= gd
9	PORTVERSION= 2.0.11	9	PORTVERSION= 2.0.12
10	CATEGORIES+= graphics	10	CATEGORIES+= graphics
11	MASTER_SITES= http://www.boutell.com/gd/http/ \	11	MASTER_SITES= http://www.boutell.com/gd/http/ \
12	ftp://ftp.boutell.com/pub/boutell/gd/ \	12	ftp://ftp.boutell.com/pub/boutell/gd/ \
Lines 57-63 Link Here
57		57
58	post-patch:	58	post-patch:
59	.if !defined(WITH_LZW)	59	.if !defined(WITH_LZW)
60	${MV} ${WRKSRC}/gd_gif_out.c ${WRKSRC}/gd_gif_out.c.nogif && \	60	@${MV} ${WRKSRC}/gd_gif_out.c ${WRKSRC}/gd_gif_out.c.nogif && \
61	${SED} -e "s\|#define LZW_LICENCED\|\|g" \	61	${SED} -e "s\|#define LZW_LICENCED\|\|g" \
62	< ${WRKSRC}/gd_gif_out.c.nogif \	62	< ${WRKSRC}/gd_gif_out.c.nogif \
63	> ${WRKSRC}/gd_gif_out.c	63	> ${WRKSRC}/gd_gif_out.c

Line 1 Link Here

(-)distinfo (-1 / +1 lines)
1	MD5 (gd-2.0.11.tar.gz) = e2b6a14e7ac9781789e5d9f189af8475	1	MD5 (gd-2.0.12.tar.gz) = de82080fbac781cfcd512c3c299066d7

Lines 21-25 Link Here

(-)pkg-plist (-2 / +2 lines)
21	lib/libgd.a	21	lib/libgd.a
22	lib/libgd.so	22	lib/libgd.so
23	lib/libgd.so.4	23	lib/libgd.so.4
24	%%PORTDOCS%%share/doc/gd/index.html	24	%%PORTDOCS%%%%DOCSDIR%%/index.html
25	%%PORTDOCS%%@dirrm share/doc/gd	25	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Lines 6-12 Link Here

(-)files/Makefile.bsd (-1 / +1 lines)
6	gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c \	6	gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c \
7	gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c \	7	gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c \
8	gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h \	8	gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h \
9	gdkanji.c gdtables.c gdxpm.c jisx0208.h mathmake.c \	9	gdkanji.c gdtables.c gdxpm.c jisx0208.h \
10	wbmp.c wbmp.h	10	wbmp.c wbmp.h
11	SRCS+= gd_gif_in.c gd_gif_out.c gd_biggif_out.c gd_lzw_out.c	11	SRCS+= gd_gif_in.c gd_gif_out.c gd_biggif_out.c gd_lzw_out.c
12	MAKEDIR=/usr/share/mk	12	MAKEDIR=/usr/share/mk




--- gd.c.orig	Sat Mar 29 17:25:42 2003
+++ gd.c	Wed May 14 16:46:34 2003
@@ -2696,6 +2696,16 @@
 }
 
 void
 gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c)
 {
+{
+	if (!n) {
+		return;
+	}

+
+void
+gdImageOpenPolygon (gdImagePtr im, gdPointPtr p, int n, int c)
+{
   int i;
   int lx, ly;
   if (!n)
@@ -2710,7 +2720,6 @@
 
   lx = p->x;
   ly = p->y;
-  gdImageLine (im, lx, ly, p[n - 1].x, p[n - 1].y, c);
   for (i = 1; (i < n); i++)
     {
       p++;
@@ -2461,8 +2489,8 @@
     {
       for (x = 0; (x < sx); x++)
 	{
-	  p1 = im1->pixels[y][x];
-	  p2 = im2->pixels[y][x];
+	  p1 = im1->trueColor ? gdImageTrueColorPixel(im1, x, y) : gdImagePalettePixel(im1, x, y);
+	  p2 = im2->trueColor ? gdImageTrueColorPixel(im2, x, y) : gdImagePalettePixel(im2, x, y);
 	  if (gdImageRed (im1, p1) != gdImageRed (im2, p2))
 	    {
 	      cmpStatus |= GD_CMP_COLOR + GD_CMP_IMAGE;

Return to bug 52235

Lines 1-12 Link Here

(-)files/patch-gd.c (-22 / +9 lines)
1	--- gd.c Thu Apr 25 14:15:15 2002	1	--- gd.c.orig Sat Mar 29 17:25:42 2003
2	+++ gd.c Thu Apr 25 12:43:55 2002	2	+++ gd.c Wed May 14 16:46:34 2003
3	@@ -2211,7 +2230,17 @@	3	@@ -2696,6 +2696,16 @@
4	}
5
6	void	4	void
7	-gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c)	5	gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c)
8	+gdImagePolygon(gdImagePtr im, gdPointPtr p, int n, int c)	6	{
9	+{
10	+ if (!n) {	7	+ if (!n) {
11	+ return;	8	+ return;
12	+ }	9	+ }
Lines 16-40 Link Here
16	+	13	+
17	+void	14	+void
18	+gdImageOpenPolygon (gdImagePtr im, gdPointPtr p, int n, int c)	15	+gdImageOpenPolygon (gdImagePtr im, gdPointPtr p, int n, int c)
19	{	16	+{
20	int i;	17	int i;
21	int lx, ly;	18	int lx, ly;
22	@@ -2221,7 +2250,6 @@	19	if (!n)
23	}	20	@@ -2710,7 +2720,6 @@
		21
24	lx = p->x;	22	lx = p->x;
25	ly = p->y;	23	ly = p->y;
26	- gdImageLine (im, lx, ly, p[n - 1].x, p[n - 1].y, c);	24	- gdImageLine (im, lx, ly, p[n - 1].x, p[n - 1].y, c);
27	for (i = 1; (i < n); i++)	25	for (i = 1; (i < n); i++)
28	{	26	{
29	p++;	27	p++;
30	@@ -2461,8 +2489,8 @@
31	{
32	for (x = 0; (x < sx); x++)
33	{
34	- p1 = im1->pixels[y][x];
35	- p2 = im2->pixels[y][x];
36	+ p1 = im1->trueColor ? gdImageTrueColorPixel(im1, x, y) : gdImagePalettePixel(im1, x, y);
37	+ p2 = im2->trueColor ? gdImageTrueColorPixel(im2, x, y) : gdImagePalettePixel(im2, x, y);
38	if (gdImageRed (im1, p1) != gdImageRed (im2, p2))
39	{
40	cmpStatus \|= GD_CMP_COLOR + GD_CMP_IMAGE;