---- gd-2.0.9/Makefile.am.orig Tue Nov 12 20:29:13 2002
-+++ gd-2.0.9/Makefile.am Fri Jan 10 21:34:04 2003
-@@ -5,7 +5,7 @@
-
- SUBDIRS = config test
-
--bin_PROGRAMS = annotate gdparttopng gdtopng gd2copypal gd2topng pngtogd pngtogd2 webpng
-+bin_PROGRAMS = annotate gdparttopng gdtopng gd2copypal gd2topng pngtogd pngtogd2 webpng gd2togif gdcmpgif giftogd2
-
- bin_SCRIPTS = bdftogd
-
-@@ -17,7 +17,7 @@
-
- lib_LTLIBRARIES = libgd.la
-
--libgd_la_SOURCES = gd.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h mathmake.c wbmp.c wbmp.h
-+libgd_la_SOURCES = gd.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h mathmake.c wbmp.c wbmp.h gd_gif_in.c gd_gif_out.c gd_biggif_out.c gd_lzw_out.c
-
- libgd_la_LDFLAGS = -version-info 2:0:0
-
-diff -Naur gd-2.0.7orig/gd.c gd-2.0.7gif/gd.c
---- gd-2.0.7orig/gd.c 2002-11-15 02:36:11.000000000 +1100
-+++ gd-2.0.7gif/gd.c 2002-11-18 11:39:01.000000000 +1100
-@@ -1831,22 +1831,24 @@
- tox++;
- continue;
- }
-- /* If it's the same image, mapping is trivial */
-- if (dst == src)
-+ /* If it's the same image, mapping is NOT trivial since we merge with greyscale target,
-+ * but if pct is 100, the grey value is not used, so it becomes trivial. */
-+ if (dst == src && pct == 100)
- {
- nc = c;
- }
- else
- {
- dc = gdImageGetPixel (dst, tox, toy);
-- g = 0.29900 * dst->red[dc]
-- + 0.58700 * dst->green[dc] + 0.11400 * dst->blue[dc];
-+ g = 0.29900 * gdImageRed(dst,dc)
-+ + 0.58700 * gdImageGreen(dst,dc)
-+ + 0.11400 * gdImageBlue(dst, dc);
-
- ncR = gdImageRed (src, c) * (pct / 100.0)
-- + gdImageRed (dst, dc) * g * ((100 - pct) / 100.0);
-+ + g * ((100 - pct) / 100.0);
- ncG = gdImageGreen (src, c) * (pct / 100.0)
-- + gdImageGreen (dst, dc) * g * ((100 - pct) / 100.0);
-+ + g * ((100 - pct) / 100.0);
- ncB = gdImageBlue (src, c) * (pct / 100.0)
-- + gdImageBlue (dst, dc) * g * ((100 - pct) / 100.0);
-+ + g * ((100 - pct) / 100.0);
-
- /* First look for an exact match */
-@@ -2253,7 +2254,17 @@
- }
-
- void
--gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c)
-+gdImagePolygon(gdImagePtr im, gdPointPtr p, int n, int c)
-+{
-+ if (!n) {
-+ return;
-+ }
-+ gdImageLine(im, p->x, p->y, p[n-1].x, p[n-1].y, c);
-+ gdImageOpenPolygon(im, p, n, c);
-+}
-+
-+void
-+gdImageOpenPolygon (gdImagePtr im, gdPointPtr p, int n, int c)
- {
- int i;
- int lx, ly;
-@@ -2263,7 +2274,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++;
-@@ -2503,8 +2513,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;
-diff -Naur gd-2.0.7orig/gd.h gd-2.0.7gif/gd.h
---- gd-2.0.7orig/gd.h 2002-11-14 02:51:02.000000000 +1100
-+++ gd-2.0.7gif/gd.h 2002-11-18 11:39:01.000000000 +1100
-@@ -201,6 +201,10 @@
-
- gdImagePtr gdImageCreateFromPngSource (gdSourcePtr in);
-
-+ gdImagePtr gdImageCreateFromGif (FILE * fd);
-+ gdImagePtr gdImageCreateFromGifCtx (gdIOCtxPtr in);
-+ gdImagePtr gdImageCreateFromGifSource (gdSourcePtr in);
-+
- gdImagePtr gdImageCreateFromGd (FILE * in);
- gdImagePtr gdImageCreateFromGdCtx (gdIOCtxPtr in);
-
-@@ -274,6 +278,7 @@
- } gdPoint, *gdPointPtr;
-
- void gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c);
-+ void gdImageOpenPolygon (gdImagePtr im, gdPointPtr p, int n, int c);
- void gdImageFilledPolygon (gdImagePtr im, gdPointPtr p, int n, int c);
-
- /* These functions still work with truecolor images,
-@@ -368,6 +373,14 @@
- /* Best to free this memory with gdFree(), not free() */
- void *gdImageJpegPtr (gdImagePtr im, int *size, int quality);
-
-+void gdImageLzw(gdImagePtr im, FILE *out);
-+void* gdImageLzwPtr(gdImagePtr im, int *size);
-+void gdImageLzwCtx(gdImagePtr im, gdIOCtxPtr out);
-+
-+void gdImageBigGif(gdImagePtr im, FILE *out);
-+void* gdImageBigGifPtr(gdImagePtr im, int *size);
-+void gdImageBigGifCtx(gdImagePtr im, gdIOCtxPtr out);
-+
- /* A custom data sink. For backwards compatibility. Use
- gdIOCtx instead. */
- /* The sink function must return -1 on error, otherwise the number
-@@ -380,6 +393,11 @@
-
- void gdImagePngToSink (gdImagePtr im, gdSinkPtr out);
-
-+ void gdImageGif (gdImagePtr im, FILE *out);
-+ void* gdImageGifPtr (gdImagePtr im, int *size);
-+ void gdImageGifCtx (gdImagePtr im, gdIOCtxPtr out);
-+ void gdImageGifToSink (gdImagePtr im, gdSinkPtr out);
-+
- void gdImageGd (gdImagePtr im, FILE * out);
- void gdImageGd2 (gdImagePtr im, FILE * out, int cs, int fmt);
-
-diff -Naur gd-2.0.7orig/gd2togif.c gd-2.0.7gif/gd2togif.c
---- gd-2.0.7orig/gd2togif.c 1970-01-01 10:00:00.000000000 +1000
-+++ gd-2.0.7gif/gd2togif.c 2002-11-18 11:39:01.000000000 +1100
+diff -Nur gd-2.0.17.orig/gd2togif.c gd-2.0.17/gd2togif.c
+--- gd-2.0.17.orig/gd2togif.c 1970-01-01 01:00:00.000000000 +0100
++++ gd-2.0.17/gd2togif.c 2003-12-26 15:35:52.279572344 +0100
@@ -0,0 +1,40 @@
+#include <stdio.h>
+#include "gd.h"
+ return 0;
+}
+
-diff -Naur gd-2.0.7orig/gd_biggif_out.c gd-2.0.7gif/gd_biggif_out.c
---- gd-2.0.7orig/gd_biggif_out.c 1970-01-01 10:00:00.000000000 +1000
-+++ gd-2.0.7gif/gd_biggif_out.c 2002-11-18 11:39:01.000000000 +1100
+diff -Nur gd-2.0.17.orig/gd_biggif_out.c gd-2.0.17/gd_biggif_out.c
+--- gd-2.0.17.orig/gd_biggif_out.c 1970-01-01 01:00:00.000000000 +0100
++++ gd-2.0.17/gd_biggif_out.c 2003-12-26 15:35:52.285571432 +0100
@@ -0,0 +1,823 @@
+#include <stdio.h>
+#include <math.h>
+/* | provided "as is" without express or implied warranty. | */
+/* +-------------------------------------------------------------------+ */
+
-diff -Naur gd-2.0.7orig/gd_gif_in.c gd-2.0.7gif/gd_gif_in.c
---- gd-2.0.7orig/gd_gif_in.c 1970-01-01 10:00:00.000000000 +1000
-+++ gd-2.0.7gif/gd_gif_in.c 2002-11-18 11:39:01.000000000 +1100
+diff -Nur gd-2.0.17.orig/gd.c gd-2.0.17/gd.c
+--- gd-2.0.17.orig/gd.c 2003-12-24 22:43:06.000000000 +0100
++++ gd-2.0.17/gd.c 2003-12-26 15:35:52.264574624 +0100
+@@ -2695,7 +2695,17 @@
+ }
+
+ void
+-gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c)
++gdImagePolygon(gdImagePtr im, gdPointPtr p, int n, int c)
++{
++ if (!n) {
++ return;
++ }
++ gdImageLine(im, p->x, p->y, p[n-1].x, p[n-1].y, c);
++ gdImageOpenPolygon(im, p, n, c);
++}
++
++void
++gdImageOpenPolygon (gdImagePtr im, gdPointPtr p, int n, int c)
+ {
+ int i;
+ int lx, ly;
+@@ -2711,7 +2721,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++;
+diff -Nur gd-2.0.17.orig/gdcmpgif.c gd-2.0.17/gdcmpgif.c
+--- gd-2.0.17.orig/gdcmpgif.c 1970-01-01 01:00:00.000000000 +0100
++++ gd-2.0.17/gdcmpgif.c 2003-12-26 15:35:52.303568696 +0100
+@@ -0,0 +1,85 @@
++#include <stdio.h>
++#include <unistd.h> /* For unlink function */
++#include "gd.h"
++
++/* A short program which converts a .png file into a .gd file, for
++ your convenience in creating images on the fly from a
++ basis image that must be loaded quickly. The .gd format
++ is not intended to be a general-purpose format. */
++
++void CompareImages(char *msg, gdImagePtr im1, gdImagePtr im2);
++
++
++int main(int argc, char **argv)
++{
++ gdImagePtr im1, im2;
++ FILE *in;
++
++ if (argc != 3) {
++ fprintf(stderr, "Usage: gdcmpgif filename.gif filename.gif\n");
++ exit(1);
++ }
++ in = fopen(argv[1], "rb");
++ if (!in) {
++ fprintf(stderr, "Input file does not exist!\n");
++ exit(1);
++ }
++ im1 = gdImageCreateFromGif(in);
++ fclose(in);
++
++ if (!im1) {
++ fprintf(stderr, "Input is not in GIF format!\n");
++ exit(1);
++ }
++
++ in = fopen(argv[2], "rb");
++ if (!in) {
++ fprintf(stderr, "Input file 2 does not exist!\n");
++ exit(1);
++ }
++ im2 = gdImageCreateFromGif(in);
++ fclose(in);
++
++ if (!im2) {
++ fprintf(stderr, "Input 2 is not in GIF format!\n");
++ exit(1);
++ }
++
++ CompareImages("gdcmpgif", im1, im2);
++
++ gdImageDestroy(im1);
++ gdImageDestroy(im2);
++
++ return 0;
++}
++
++void CompareImages(char *msg, gdImagePtr im1, gdImagePtr im2)
++{
++ int cmpRes;
++
++ cmpRes = gdImageCompare(im1, im2);
++
++ if (cmpRes & GD_CMP_IMAGE) {
++ printf("%%%s: ERROR images differ: BAD\n",msg);
++ } else if (cmpRes != 0) {
++ printf("%%%s: WARNING images differ: WARNING - Probably OK\n",msg);
++ } else {
++ printf("%%%s: OK\n",msg);
++ return;
++ }
++
++ if (cmpRes & (GD_CMP_SIZE_X + GD_CMP_SIZE_Y)) {
++ printf("-%s: INFO image sizes differ\n",msg);
++ }
++
++ if (cmpRes & GD_CMP_NUM_COLORS) {
++ printf("-%s: INFO number of pallette entries differ %d Vs. %d\n",msg,
++ im1->colorsTotal, im2->colorsTotal);
++ }
++
++ if (cmpRes & GD_CMP_COLOR) {
++ printf("-%s: INFO actual colours of pixels differ\n",msg);
++ }
++}
++
++
+diff -Nur gd-2.0.17.orig/gd_gif_in.c gd-2.0.17/gd_gif_in.c
+--- gd-2.0.17.orig/gd_gif_in.c 1970-01-01 01:00:00.000000000 +0100
++++ gd-2.0.17/gd_gif_in.c 2003-12-26 15:35:52.291570520 +0100
@@ -0,0 +1,573 @@
+#include <stdio.h>
+#include <math.h>
+ }
+}
+
-diff -Naur gd-2.0.7orig/gd_gif_out.c gd-2.0.7gif/gd_gif_out.c
---- gd-2.0.7orig/gd_gif_out.c 1970-01-01 10:00:00.000000000 +1000
-+++ gd-2.0.7gif/gd_gif_out.c 2002-11-18 11:39:01.000000000 +1100
+diff -Nur gd-2.0.17.orig/gd_gif_out.c gd-2.0.17/gd_gif_out.c
+--- gd-2.0.17.orig/gd_gif_out.c 1970-01-01 01:00:00.000000000 +0100
++++ gd-2.0.17/gd_gif_out.c 2003-12-26 15:35:52.294570064 +0100
@@ -0,0 +1,46 @@
+#include <stdio.h>
+#include <math.h>
+#endif
+}
+
-diff -Naur gd-2.0.7orig/gd_lzw_out.c gd-2.0.7gif/gd_lzw_out.c
---- gd-2.0.7orig/gd_lzw_out.c 1970-01-01 10:00:00.000000000 +1000
-+++ gd-2.0.7gif/gd_lzw_out.c 2002-11-18 11:39:01.000000000 +1100
+diff -Nur gd-2.0.17.orig/gd.h gd-2.0.17/gd.h
+--- gd-2.0.17.orig/gd.h 2003-12-24 20:55:14.000000000 +0100
++++ gd-2.0.17/gd.h 2003-12-26 15:35:52.276572800 +0100
+@@ -240,6 +240,10 @@
+
+ gdImagePtr gdImageCreateFromPngSource (gdSourcePtr in);
+
++ gdImagePtr gdImageCreateFromGif (FILE *fd);
++ gdImagePtr gdImageCreateFromGifCtx (gdIOCtxPtr in);
++ gdImagePtr gdImageCreateFromGifSource (gdSourcePtr in);
++
+ gdImagePtr gdImageCreateFromGd (FILE * in);
+ gdImagePtr gdImageCreateFromGdCtx (gdIOCtxPtr in);
+
+@@ -354,6 +358,7 @@
+ gdPoint, *gdPointPtr;
+
+ void gdImagePolygon (gdImagePtr im, gdPointPtr p, int n, int c);
++ void gdImageOpenPolygon (gdImagePtr im, gdPointPtr p, int n, int c);
+ void gdImageFilledPolygon (gdImagePtr im, gdPointPtr p, int n, int c);
+
+ /* These functions still work with truecolor images,
+@@ -455,6 +460,14 @@
+ /* Best to free this memory with gdFree(), not free() */
+ void *gdImageJpegPtr (gdImagePtr im, int *size, int quality);
+
++void gdImageLzw(gdImagePtr im, FILE *out);
++void* gdImageLzwPtr(gdImagePtr im, int *size);
++void gdImageLzwCtx(gdImagePtr im, gdIOCtxPtr out);
++
++void gdImageBigGif(gdImagePtr im, FILE *out);
++void* gdImageBigGifPtr(gdImagePtr im, int *size);
++void gdImageBigGifCtx(gdImagePtr im, gdIOCtxPtr out);
++
+ /* A custom data sink. For backwards compatibility. Use
+ gdIOCtx instead. */
+ /* The sink function must return -1 on error, otherwise the number
+@@ -469,6 +482,11 @@
+
+ void gdImagePngToSink (gdImagePtr im, gdSinkPtr out);
+
++ void gdImageGif (gdImagePtr im, FILE *out);
++ void* gdImageGifPtr (gdImagePtr im, int *size);
++ void gdImageGifCtx (gdImagePtr im, gdIOCtxPtr out);
++ void gdImageGifToSink (gdImagePtr im, gdSinkPtr out);
++
+ void gdImageGd (gdImagePtr im, FILE * out);
+ void gdImageGd2 (gdImagePtr im, FILE * out, int cs, int fmt);
+
+diff -Nur gd-2.0.17.orig/gd_lzw_out.c gd-2.0.17/gd_lzw_out.c
+--- gd-2.0.17.orig/gd_lzw_out.c 1970-01-01 01:00:00.000000000 +0100
++++ gd-2.0.17/gd_lzw_out.c 2003-12-26 15:35:52.300569152 +0100
@@ -0,0 +1,796 @@
+#include <malloc.h>
+#include <stdio.h>
+/* | notice appear in supporting documentation. This software is | */
+/* | provided "as is" without express or implied warranty. | */
+/* +-------------------------------------------------------------------+ */
-diff -Naur gd-2.0.7orig/gdcmpgif.c gd-2.0.7gif/gdcmpgif.c
---- gd-2.0.7orig/gdcmpgif.c 1970-01-01 10:00:00.000000000 +1000
-+++ gd-2.0.7gif/gdcmpgif.c 2002-11-18 11:39:01.000000000 +1100
-@@ -0,0 +1,85 @@
-+#include <stdio.h>
-+#include <unistd.h> /* For unlink function */
-+#include "gd.h"
-+
-+/* A short program which converts a .png file into a .gd file, for
-+ your convenience in creating images on the fly from a
-+ basis image that must be loaded quickly. The .gd format
-+ is not intended to be a general-purpose format. */
-+
-+void CompareImages(char *msg, gdImagePtr im1, gdImagePtr im2);
-+
-+
-+int main(int argc, char **argv)
-+{
-+ gdImagePtr im1, im2;
-+ FILE *in;
-+
-+ if (argc != 3) {
-+ fprintf(stderr, "Usage: gdcmpgif filename.gif filename.gif\n");
-+ exit(1);
-+ }
-+ in = fopen(argv[1], "rb");
-+ if (!in) {
-+ fprintf(stderr, "Input file does not exist!\n");
-+ exit(1);
-+ }
-+ im1 = gdImageCreateFromGif(in);
-+ fclose(in);
-+
-+ if (!im1) {
-+ fprintf(stderr, "Input is not in GIF format!\n");
-+ exit(1);
-+ }
-+
-+ in = fopen(argv[2], "rb");
-+ if (!in) {
-+ fprintf(stderr, "Input file 2 does not exist!\n");
-+ exit(1);
-+ }
-+ im2 = gdImageCreateFromGif(in);
-+ fclose(in);
-+
-+ if (!im2) {
-+ fprintf(stderr, "Input 2 is not in GIF format!\n");
-+ exit(1);
-+ }
-+
-+ CompareImages("gdcmpgif", im1, im2);
-+
-+ gdImageDestroy(im1);
-+ gdImageDestroy(im2);
-+
-+ return 0;
-+}
-+
-+void CompareImages(char *msg, gdImagePtr im1, gdImagePtr im2)
-+{
-+ int cmpRes;
-+
-+ cmpRes = gdImageCompare(im1, im2);
-+
-+ if (cmpRes & GD_CMP_IMAGE) {
-+ printf("%%%s: ERROR images differ: BAD\n",msg);
-+ } else if (cmpRes != 0) {
-+ printf("%%%s: WARNING images differ: WARNING - Probably OK\n",msg);
-+ } else {
-+ printf("%%%s: OK\n",msg);
-+ return;
-+ }
-+
-+ if (cmpRes & (GD_CMP_SIZE_X + GD_CMP_SIZE_Y)) {
-+ printf("-%s: INFO image sizes differ\n",msg);
-+ }
-+
-+ if (cmpRes & GD_CMP_NUM_COLORS) {
-+ printf("-%s: INFO number of pallette entries differ %d Vs. %d\n",msg,
-+ im1->colorsTotal, im2->colorsTotal);
-+ }
-+
-+ if (cmpRes & GD_CMP_COLOR) {
-+ printf("-%s: INFO actual colours of pixels differ\n",msg);
-+ }
-+}
-+
-+
-diff -Naur gd-2.0.7orig/gdtest.c gd-2.0.7gif/gdtest.c
---- gd-2.0.7orig/gdtest.c 2002-11-02 05:40:42.000000000 +1100
-+++ gd-2.0.7gif/gdtest.c 2002-11-18 11:39:01.000000000 +1100
-@@ -90,6 +90,59 @@
+diff -Nur gd-2.0.17.orig/gdtest.c gd-2.0.17/gdtest.c
+--- gd-2.0.17.orig/gdtest.c 2003-03-29 16:46:35.000000000 +0100
++++ gd-2.0.17/gdtest.c 2003-12-26 15:35:52.313567176 +0100
+@@ -91,6 +91,59 @@
gdImageDestroy (im2);
ctx->gd_free (ctx);
/* */
/* Send to GD2 File then Ptr */
-@@ -206,8 +259,6 @@
+@@ -209,8 +262,6 @@
gdImageDestroy (im2);
};
/* */
/* Test Extraction */
/* */
-@@ -273,6 +324,10 @@
+@@ -277,6 +328,10 @@
printf ("[Merged Image has %d colours]\n", im2->colorsTotal);
CompareImages ("Merged (gdtest.png, gdtest_merge.png)", im2, im3);
gdImageDestroy (im2);
gdImageDestroy (im3);
-diff -Naur gd-2.0.7orig/gdtestft.c gd-2.0.7gif/gdtestft.c
---- gd-2.0.7orig/gdtestft.c 2002-11-15 02:39:33.000000000 +1100
-+++ gd-2.0.7gif/gdtestft.c 2002-11-18 11:39:01.000000000 +1100
+diff -Nur gd-2.0.17.orig/gdtestft.c gd-2.0.17/gdtestft.c
+--- gd-2.0.17.orig/gdtestft.c 2003-03-29 16:46:35.000000000 +0100
++++ gd-2.0.17/gdtestft.c 2003-12-26 15:35:52.316566720 +0100
@@ -23,6 +23,8 @@
#define MAXY(x) MAX4(x[1],x[3],x[5],x[7])
#define MINY(x) MIN4(x[1],x[3],x[5],x[7])
int
main (int argc, char *argv[])
{
-diff -Naur gd-2.0.7orig/giftogd2.c gd-2.0.7gif/giftogd2.c
---- gd-2.0.7orig/giftogd2.c 1970-01-01 10:00:00.000000000 +1000
-+++ gd-2.0.7gif/giftogd2.c 2002-11-18 11:39:01.000000000 +1100
+diff -Nur gd-2.0.17.orig/giftogd2.c gd-2.0.17/giftogd2.c
+--- gd-2.0.17.orig/giftogd2.c 1970-01-01 01:00:00.000000000 +0100
++++ gd-2.0.17/giftogd2.c 2003-12-26 15:35:52.319566264 +0100
@@ -0,0 +1,48 @@
+#include <stdio.h>
+#include <stdlib.h>
+ return 0;
+}
+
-diff -Naur gd-2.0.7orig/index.html gd-2.0.7gif/index.html
---- gd-2.0.7orig/index.html 2002-11-16 11:54:40.000000000 +1100
-+++ gd-2.0.7gif/index.html 2002-11-18 11:39:01.000000000 +1100
+diff -Nur gd-2.0.17.orig/index.html gd-2.0.17/index.html
+--- gd-2.0.17.orig/index.html 2003-12-25 17:43:52.000000000 +0100
++++ gd-2.0.17/index.html 2003-12-26 15:38:31.022439760 +0100
@@ -28,7 +28,12 @@
more compatible with the major Web browsers than even PNG is. WBMP is
intended for wireless devices (not regular web browsers). Old
+who have not yet managed to move away from GIFs.
+<p>
+<strong>Please do not ask the original author to send you the old GIF
- version of GD.</strong> Unisys holds a patent on the LZW compression
- algorithm, which is used in fully compressed GIF images. The best
+ version of GD.</strong> Yes, Unisys still holds a patent on the LZW compression
+ algorithm in some countries. The best
solution is to move to legally unencumbered, well-compressed,
-@@ -116,6 +121,18 @@
+@@ -117,6 +122,18 @@
Portions relating to WBMP copyright 2000, 2001, 2002 Maurice Szmurlo and Johan Van
den Brande.
<p>
<strong>Permission has been granted to copy, distribute and modify gd in any
context without fee, including a commercial application, provided that this notice
is present in user-accessible supporting documentation.</strong>
-@@ -191,6 +208,24 @@
+@@ -202,6 +219,24 @@
<ul>
<li><a href="http://martin.gleeson.com/fly/">fly</a>, by Martin Gleeson
</ul>
+Note: While every effort has been made to ensure that the _WinNT_ build works, it has not
+been tested.
<P>
- <A NAME="whatsnew2.0.7"><H3>What's new in version 2.0.7?</H3></A>
+ <A NAME="whatsnew2.0.17"><H3>What's new in version 2.0.17?</H3></A>
<P>
-@@ -418,6 +453,7 @@
+@@ -659,6 +694,7 @@
preprocessing them, this should not be a big problem. gd 2.0 should
read old .gd and .gd2 files correctly.
</ul>
+
<P><A NAME="whatsnew1.8.4"><H3>What's new in version 1.8.4?</H3></A>
<ul>
- <li>Add support for FreeType2 (John Ellson ellson@lucent.com)
-@@ -450,6 +486,7 @@
+ <li>Add support for FreeType2 (John Ellson ellson@graphviz.org)
+@@ -691,6 +727,7 @@
corrected
<li>Updated links to fast-moving, always dodging libpng and zlib web sites
</ul>
<P><A NAME="whatsnew1.8.1"><H3>What's new in version 1.8.1?</H3></A>
<ul>
<li>Optional components no longer built by default (following the
-@@ -527,6 +564,7 @@
+@@ -768,6 +805,7 @@
<a href="#gdImageCreateFromXpm"><code>gdImageCreateFromXpm</code></a>
function, if the Xpm library is available. Thanks to Caolan McNamara.
</ul>
<P><A NAME="whatsnew1.6.3"><H3>What's new in version 1.6.3?</H3></A>
Version 1.6.3 corrects a memory leak in gd_png.c. This leak caused
a significant amount of memory to be allocated and not freed when
-@@ -1047,7 +1085,8 @@
+@@ -1334,7 +1372,8 @@
<DT><A NAME="gdPoint">gdPoint</A> <strong>(TYPE)</strong>
<DD>
Represents a point in the coordinate space of the image; used
<A HREF="#gdImageFilledPolygon">gdImageFilledPolygon</A>.
<PRE>
typedef struct {
-@@ -1057,7 +1096,8 @@
+@@ -1344,7 +1383,8 @@
<DT><A NAME="gdPointPtr">gdPointPtr</A> <strong>(TYPE)</strong>
<DD>
A pointer to a <A HREF="#gdPoint">gdPoint</A> structure; passed
and <A HREF="#gdImageFilledPolygon">gdImageFilledPolygon</A>.
</DL>
<DT><A NAME="gdFTStringExtra">gdFTStringExtra</a> <strong>(TYPE)</strong>
-@@ -1175,6 +1215,75 @@
+@@ -1457,6 +1497,75 @@
/* ... Use the image ... */
<A HREF="#gdImageDestroy">gdImageDestroy</A>(im);
</PRE>
<DT><A NAME="gdImageCreateFromPng">gdImageCreateFromPng(FILE *in)</A>
<strong>(FUNCTION)</strong>
<BR><A NAME="gdImageCreateFromPngCtx">gdImageCreateFromPngCtx(<a href=#gdioctx>gdIOCtx</a> *in)</A>
-@@ -1390,6 +1499,92 @@
+@@ -1672,6 +1781,92 @@
/* Now destroy it */
<A HREF="#gdImageDestroy">gdImageDestroy</A>(im);
</PRE>
<DT><A NAME="gdImageJpeg">
void gdImageJpeg(gdImagePtr im, FILE *out, int quality)</A>
<STRONG>(FUNCTION)</STRONG><BR>
-@@ -1810,6 +2005,15 @@
+@@ -2133,6 +2328,15 @@
/* Destroy it */
<A HREF="#gdImageDestroy">gdImageDestroy</A>(im);
</PRE>
<DT><A NAME="gdImageRectangle">void gdImageRectangle(gdImagePtr im, int x1, int y1, int x2, int y2, int color)</A>
<STRONG>(FUNCTION)</STRONG>
<DD>
-@@ -3784,6 +3988,9 @@
- <A HREF="#gdImageCreateFromGd">gdImageCreateFromGd</A> |
- <A HREF="#gdImageCreateFromGd2">gdImageCreateFromGd2</A> |
+@@ -4488,6 +4692,9 @@
+ <A HREF="#gdImageCreateFromGd2Ctx">gdImageCreateFromGd2Ctx</A> |
<A HREF="#gdImageCreateFromGd2Part">gdImageCreateFromGd2Part</A> |
+ <A HREF="#gdImageCreateFromGd2PartCtx">gdImageCreateFromGd2PartCtx</A> |
+<A HREF="#gdImageCreateFromGif">gdImageCreateFromGif</A> |
+<A HREF="#gdImageCreateFromGifCtx">gdImageCreateFromGifCtx</A> |
+<A HREF="#gdImageCreateFromGifSource">gdImageCreateFromGifSource</A> |
<A HREF="#gdImageCreateFromJpeg">gdImageCreateFromJpeg</A> |
+ <A HREF="#gdImageCreateFromJpegCtx">gdImageCreateFromJpegCtx</A> |
<A HREF="#gdImageCreateFromPng">gdImageCreateFromPng</A> |
- <A HREF="#gdImageCreateFromPngSource">gdImageCreateFromPngSource</A> |
-@@ -3801,6 +4008,10 @@
+@@ -4507,6 +4714,10 @@
<A HREF="#gdImageGetInterlaced">gdImageGetInterlaced</A> |
<A HREF="#gdImageGetPixel">gdImageGetPixel</A> |
<A HREF="#gdImageGetTransparent">gdImageGetTransparent</A> |
<A HREF="#gdImageGreen">gdImageGreen</A> |
<A HREF="#gdImageInterlace">gdImageInterlace</A> |
<A HREF="#gdImageJpeg">gdImageJpeg</A> |
-@@ -3810,6 +4021,7 @@
- <A HREF="#gdImagePng">gdImagePng</A> |
+@@ -4522,6 +4733,7 @@
+ <A HREF="#gdImagePngPtrEx">gdImagePngPtrEx</A> |
<A HREF="#gdImagePngToSink">gdImagePngToSink</A> |
<A HREF="#gdImagePolygon">gdImagePolygon</A> |
+<A HREF="#gdImageOpenPolygon">gdImageOpenPolygon</A> |
<A HREF="#gdImagePtr">gdImagePtr</A> |
<A HREF="#gdImageWBMP">gdImageWBMP</A> |
- <A HREF="#gdImageRectangle">gdImageRectangle</A> |
-diff -Naur gd-2.0.7orig/test/fttestref.png gd-2.0.7gif/test/fttestref.png
---- gd-2.0.7orig/test/fttestref.png 1970-01-01 10:00:00.000000000 +1000
-+++ gd-2.0.7gif/test/fttestref.png 2002-11-18 14:30:15.000000000 +1100
-@@ -0,0 +1,19 @@
-+\89PNG\r
-+\1a
-+\0\0\0\rIHDR\0\0\07\0\0\ 1=\b\ 6\0\0\0¯7ú\94\0\0\ffIDATx\9cí]k\92ã(\fV¶ö\1eø&ö\9cÄ\99\938s\12;'±û$NNÂþØ\91[!\80\ 1 ?Ò|UÔÔTÚ\98Ïâ! !.Zk\r\1f\8a\7fön@N\14r.\.\17©v°àjG\91\9c\ f\8fÇC \19é\98¦Éù\e\9bÜ0\fÜ*ò½_3\0\0\1a\0t×uz\9egNUÑ\98çYw]·´Á\86\8bÖéëÜQ&\14\0\0\e\8d2¡\9c\15\85ÜY!B®ë:\98ç\19´ÖÑ\ 5\11ûÜ<ÏÐu\9d¿a\9cé\18\0tÛ¶\9c*¼Sy\bÚ¶u>Ï\96ÜõzåV\91íýìu\8eñøR\a\80}\9dⶣL(.p¥&\ 5W;\8aäÎ\8aBî¬(>\94³¢øP|ø\11>\94q\1cYuÄ¢øPvhÇf(äÎ\8aBn\r\1c\1fJj9\85\ f\85\8bâCI\81\84\ fE\ 2?Ò\87Â\92ÜÑñÑ\92ûhrÿæ¨t\18\ 6x<\1e0MÓbï=\9fOPJ\ 1\0@UUÐ4ÍR²ArÍéºN+¥\163$¤Ôuû¾\97lÆ\ 2\11ró<G\93²\91\94ÞWg\93\9bç\99E\8a\16¥\94(A\16¹\10\89µm«û¾×ó</\rÇßæyÖã8.*\14JP
-+,r´Qfñ\8d#ü\e\8aq\1c\97\ fÕu\1d§YßïI}p\1cÇä®e#gÖ)Ñ=\93×9\9bKM)\ 5Ó4AUUIu6M\ 3mÛ:ë\8fFêW±\8dµÐ¯\r\ eÉiý-=\89±'F.Æ®ó\91Ãß\95R©Mû®'ùACj1~K\1f9º´p\91<æP\95B¤\8e3\13"cí/\92É\99d¤È¡{Üüx)H&g*¼\12\e"×ë\15¾¾¾¬õ'!µ?\9bjW\8cò\vdLÍó¬û¾×u]'\8faç{8\ f÷}\9f¤6\ 1ص\9a\94º¼ïáV@U°Pé\91\93R\9eEL\1eº\95\14¢\17ºH)¥Dºãò\1e©\8aÆq\Æ\8dRÊ»gçê\8a\87³çL £\94r\8e\1dü\0u]g\rþ.®½³¢\90sá\b{âMÓ8õÑÓÇ¡\0¸Ã5NO®ª*¸ßïövp¦Zø;¥£wkK N
-+\1eåácâP\94RoÒû\98Ùòù|¾\8d½\8f\91\1cÀ»ô>\8a\1c\0¼l\1f³»¥R
-+ÆqÜ<TÃUL¦É\80H\v|k°%\97uó\90\89\8f\bÕpá#N\84¸ð1ë\9c\rÅ*ðaoÅ\19 X\ 5ñ\80b\15l\83b\15ÄàH\92\ 3(VA\1c\8aU°\13\8aUà|¸X\ 5ûácÖ9\e>\9a\\96\18çÇãñ\12ç\fð\1dã\UÕ\12ã\9cý4\89äÔ;ϳ7\ 6Ó,¸½\9c\vbäè¦\7fl\91ÞèG\88\90\8b\91\96¯HK\91=æ®×+Üïwçïu]/ã\8cÆ\87Ñs\aÏç\13\0\0þüù\ 3\0\0·Û\8dÛ¬ÿÁù2ÔX¤¥mÛ¨nÖ÷ýKü¦T\17e\913\ 3J¹±$\18Dz{x\94)5©ñ\82\1fLBz"\ 1Ü]×\89\8d\13\û\ e\11À-yÈAëïPG\89z\93%\873\9c´\96\813ª\84Ëðpö\1c=\92Æ\ 5;\80[*¶\19!éäe\apK{\9c\ f\15À-\19*?MÓ¢íì\1aÀ\8dÇR$NnÐú°H8\9eX\1a
-+j\14Ü\14\ 6¦E!õÁXäè×®ë:J«À4;¶\ 3ORîBv¤ì0\fðû÷ïåÿhmã\981'\1eÓ\120Ѷ\Ò&\89/Ä1Ti\91ÖvD£Ó9'\8es¸\eÄ£ÓcÏ\8aÇ\8eÕ\18d\8bN\9f¦i)t\8cÑ1y½^Å5\1c\8a\12z\7fV\14rgE!wV°\1cDèh\954{$\91¼\14TUõ²ví\1d&eCé\966Ün7PJ\81Rj÷Ô«.\14\rå¬(äÎ\8aBî¬(äÎ\8aBî¬(äÎ\8aBî¬(äÎ\8aBî¬(äÎ\8a,\ 1Ü6`ð(ni\99[ÇY\12XgÙõ#°åÑ\v-\18à\9d\1aÃ\99\8d\9c\19ýÊ-)á âäæyN\96T\88$c¤(~®@RZ®\12º\87.Fn+b1\ 4E<Î\8fÇ\ 3\9a¦q\ 6Î`ø}Ó4o!øf8>-Ó4-\99Jm\18ÇÑ?£JHÍvh\82;ÓQÐ\f\8cæ;|`\933£íðP|\ eØ&+ß,Ê&GÇYÛ¶\9b\9cô7ñ\ï\14;\11²õÍJ\94 ëÝ"ñ\96Ò\ 1i¡ cÝ\86drôËm\9dt\ 2AÓ-ÛÆy\12¹=»£ \94\9e\1dÑ&Ï4M/Á£{\9f\13Ç÷³ó¡Ø´\90½º$m\138Ö¼(r¶Åú\bpµ%¸u®\83\80G\0\8b\9cO)>r·\f\9aPn·\9bS)Þ;4\8au·ñãñð\1e¸=
-+9묽&v\97ÆO}#§\Äm÷\ÑC·8Éìµ\90S\vÁö\81½äL©\99±ÿ\94|Î4\ 4kms& ÷U@\89¹l´Ø»
-+$`~tçÕ\ 1®
-+Ö²¡QÐe"ǽ\ 3\bÛ©\93$cÕ§\90Ú^j\e\9b\12\169¦\9d³³k®>§\83\b#açy\ e:µq»Ý\96Ü
-+\14ô\ 4\88\99£Át\ eá¿Ôõî;\98\9bä BIÄ\8e!©ì\1a!%¤WXÉáxK\19;RÇÍ|\85å\94mÛ\96µvIï\13`\89M
-+c%'1\19ĦìY+)Ë\8c\95\9cdÚ\1cóÂÊXIq\12\83ZgËËå\12<KÆÀus.\0¼d\96¢\e\90\1c\94èô-\81\9b*\128\1c¹a\18¼;;Q0\a!n6äÜÐp\81ªq\12x«\85ÎlRi\ 4B`.þ\12x«Å\|sõàKà\16ú\82\9c\e\1ckZ\8c\ 4¼\92Ë1æBU3 ¼Õ\92k÷Ƶõ»)9ê\17\91PÁBHaú:ú·\12ð\9a<\9c\9bÙ×tJ×R\83\1fW\ 2ÎZR\1d?kÖ@H\94CvrZ¿o~ø6ô13\8d¯ûå¼ßÑ\86ÕOd\93\ 4µ÷\8eH
-+\11,\7f[Î µ)}/R\88ä=qß\f¸U<Ê\1aØÙ£Ì.»\87Âí\82È´ä겧ì\96>t]÷Òe\95R»uÓlj¿ËÆ&Òå"»M\83K\89¹YâS\f6YÄ%\11:.7Q¿r¶\94Ôuý"a ì\1aHâÓC%àt§çJÖî\82iÄJÀk¬né Òú5ÌW\ 2oµ\98cak {O\ 2»9\88|\90
-+\1cxÛ+ W@nË\1e\1coît<êU×õ©\89\ 1xö
-+Ä.D\88\80ïþÆ\14¼\91Ã\è{IM2\13Õ\e¹\1cɧC὿1\ 5¶Y\ 6µ\ 6Ôûr\9a+X\7f\8e0++¹\8f\8b\99%FyÀ\90)\9bFå\-÷&\18êª0\8c r\88Øì¾[K\8fE\ eÑ÷½nÛvQª· \18\ 2_·,Ñ\fgE!wVü,r{Þz\9b]q\ 6Øï\8eðªªò*Î\0û\91ã5Ù\14g\80|×\14º\90Kqöº\19ö\82T^èCÎ\96¶\8bÏSpHr\02\16ù!»%B3Õ^«äÔß\vеö_L>Ïóâ-SJAß÷Ñ\97¦c\1du]¿=Ë\869Ã\0\84\87EI¥/@Ã\98\13±d\83\95\È\vh\b\95\ 4èÅaR\ 4äB\80R\93<3\87\8e©Ý¯"Ek\:l\11þ.ä»^E\8a\87\1d$\ fVк²,\ 5Á\ fþ]2\12\1f_WBKa_h)©dSsg×Û:Ñí.i¢Ðº\94À\85\96ì»\8d¥¦n[\16*.Dn¥æ\9e0¶\1dè\95XbIJG¥DëùB5$z\ 3{gÝvÓf×uË¡>3:h\1cÇÕxͬ»<±\90<\84+\99çá0w>JJ\f!\9eß2eW(W¨b¶\8d\10ó|*=\9b
-+\0/IqsÝûXvyÎ\8aBî¬\10ÏÀm^\1e\vð¿\86¯rdØ^\83Ô´\e{ø\ f\886\93\v\87ÐPr¥öa\93\93Ê\9c\91có\85EÎ'±¶mW\95gÛ9 ¬~ËPØ\12\9e\ 1¤\1d+Ë\15W-\92S\16\v§[Q\83uw\93ÇT\8e%\8e\95QãwWcÕ\9cí¤\80Ë\89ÄÇ\12ÑP0ºV²®]7\1f©ëMRÓðf÷\8d\ 4Ûo \90Ç¥¾«S\96vEI¯³d]É\11DMÓ@]×â\rB\97º\84Ç\99\15d3\f\83øÅÍX\97È86§O\88\\8cqñ\95Ð\v©b Q\9f7\82(t!E·^J\83Pפæ\92\94\86b5V\9fÏ'üúõ+º\17¤<\93\15&[\10ò\1cs\8a\94upHr\02nõ\9f\eA\14\e\r$]¸°Jîì'\1e\11VÉåòÝo\r«ä$ºÄ\11ð&¹O!\ 6°b\15Ün7¸\.âQã\9bÁµFØ\1c@9ó¢ç\80óä£I\f\8b©=`N\855ÝÒ\952\ 4ý\9b9à=³\8a\ 5\15Y\9a¸\ 5sã\99äm\r\rñJçè\15Vrô¥65\88JËÖP*ÁØÍ\11I\97ú\e93\ 5\9dëkº¢~Ðü Éäæ*Ù"eC®§X\1ev4ʶ\9d\85ÛU¦\9d\88ö\1c\1d\8fÙ"ec\8cF\93\j=\14øq³Xât\1c½ \84\ÊL\88ù\88¸ðÚsk}ßG\ e§ù\14à¸å"Û\86ÿóùLv³K)îo\8a3Þ\r\ 2°®g\9a\86-ý{®\ 2.¡Àg\93\1cÇ©:MS\1e§¬¤-\97zþt\18\ 6\91v8ó¡\0ðÜäMÓ$eÃ\19\86\ 1î÷{\1e\8fsÌ©\fðÌ\96¨éĬqÒ ²½º¥o\8d²Y\ e&¨Æa»ë\ 3µ\93µ\vÅRa%\87_зN\85\90³é\9f!E
-+«ö\\8câlC\8aò\9c\95\1cm\94Kz¦õàSv]7}Ò"\9dDPë\95h\ 6\1c\v!\ 6è\9a\ e\89&\90\99o\96&¼Þ\94\9cÖß
-+0MzkJB*êgsrZûÝ\ 4¢Ç0÷ §õwv_\1c\e¨õKú=Ðu!\85\12\9d~VüLrUUyµúi\9a\96`ì½ò§¬Â5\18»®óª_t½Úûª{\17¼¹öÀ£~A\86uN\1aÞÙ\12»\9cÛù\\f\87\81\8f9JÏæÇ7Õ¨#Â;[VU\ 5}ßÃ×××bY£\14©\e@2\98T\14!_À§Õï\95ë9\ 4Áê\17ݾ\ 2È\7fTE\ 2Eý:+
-+¹³â?\965\19ÆmB\11\ 1\0\0\0\0IEND®B`\82
-\ No newline at end of file
+ <A HREF="#gdImageWBMPCtx">gdImageWBMPCtx</A> |
+diff -Nur gd-2.0.17.orig/Makefile.am gd-2.0.17/Makefile.am
+--- gd-2.0.17.orig/Makefile.am 2003-12-25 02:50:00.000000000 +0100
++++ gd-2.0.17/Makefile.am 2003-12-26 15:36:42.047006544 +0100
+@@ -5,7 +5,7 @@
+
+ SUBDIRS = config test
+
+-bin_PROGRAMS = annotate gdparttopng gdtopng gd2copypal gd2topng pngtogd pngtogd2 webpng
++bin_PROGRAMS = annotate gdparttopng gdtopng gd2copypal gd2topng pngtogd pngtogd2 webpng gd2togif gdcmpgif giftogd2
+
+ bin_SCRIPTS = bdftogd
+
+@@ -17,7 +17,7 @@
+
+ lib_LTLIBRARIES = libgd.la
+
+-libgd_la_SOURCES = gd.c gdfx.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h
++libgd_la_SOURCES = gd.c gdfx.c gd_gd.c gd_gd2.c gd_io.c gd_io_dp.c gd_io_file.c gd_io_ss.c gd_jpeg.c gd_png.c gd_ss.c gd_topal.c gd_wbmp.c gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c gdft.c gdhelpers.c gdhelpers.h gdkanji.c gdtables.c gdxpm.c jisx0208.h wbmp.c wbmp.h gd_gif_in.c gd_gif_out.c gd_biggif_out.c gd_lzw_out.c
+
+ libgd_la_LDFLAGS = -version-info 2:0:0
+
+Pliki gd-2.0.17.orig/test/fttestref.png i gd-2.0.17/test/fttestref.png ró¿ni± siê
projects / packages / gd.git / commitdiff